- more changes for 1.0.0

Changed files:
    openhpi-align.patch -> 1.3
    openhpi-types.patch -> 1.6

diff --git a/openhpi-align.patch b/openhpi-align.patch
index 7f74017f3342662eba8f8cb61325f4a7fa30cc40..866f7760c0aadc6dce120b0900d2490c9cf4060f 100644 (file)
--- a/openhpi-align.patch
+++ b/openhpi-align.patch
@@ -220,3 +220,32 @@
         return -1;
  
    size += l;
+@@ -682,7 +682,7 @@
+        size += s;
+        b    += s;
+ 
+-       *tbp = (SaHpiTextBufferT *)data;
++       *tbp = (SaHpiTextBufferT *)(void*)data;
+ 
+        data += sizeof( SaHpiTextBufferT );
+        *data_size += sizeof( SaHpiTextBufferT );
+@@ -853,7 +853,7 @@
+      {
+        tUint32 data_size;
+ 
+-       id->DataRecords[i] = (SaHpiInventDataRecordT *)data_ptr;
++       id->DataRecords[i] = (SaHpiInventDataRecordT *)(void*)data_ptr;
+        s = SaHpiInventDataRecordDemarshaller( byte_order, id->DataRecords[i], b, &data_size );
+ 
+        if ( s < 0 )
+--- openhpi-1.0.0/plugins/ipmi/ipmi_controls.c.orig    2004-06-14 06:38:42.000000000 +0000
++++ openhpi-1.0.0/plugins/ipmi/ipmi_controls.c 2004-07-03 15:13:28.000000000 +0000
+@@ -111,7 +111,7 @@
+         }
+                         
+         ipmi_control_set_val(control, 
+-                             (int *)&info->state->StateUnion.Oem.Body[0],
++                             (int *)(void*)&info->state->StateUnion.Oem.Body[0],
+                              __set_control_state, info);
+ }
+ 

diff --git a/openhpi-types.patch b/openhpi-types.patch
index 4a9341e0f579776f40c8157efdc8096a31011d14..64a866beddabc2a095128cc79eff57456a72548a 100644 (file)
--- a/openhpi-types.patch
+++ b/openhpi-types.patch
@@ -114,3 +114,23 @@
  
            Output( b );
          }
+--- openhpi-1.0.0/hpi_shell/hpi_cmd.c.orig     2004-06-28 22:06:50.000000000 +0000
++++ openhpi-1.0.0/hpi_shell/hpi_cmd.c  2004-07-03 16:00:27.000000000 +0000
+@@ -456,7 +456,7 @@
+    printf("Command> ");
+ 
+    rv = pthread_create(&discover_thread, NULL, sahpi_discover_thread,
+-                    (void *)sessionid);
++                    (void *)(size_t)sessionid);
+ 
+    if (rv)
+      printf("Error creating event thread\n");
+@@ -528,7 +528,7 @@
+       struct timeval to;
+ 
+       while (thread == 1) {
+-              rv = saHpiResourcesDiscover((SaHpiSessionIdT) sessionid);
++              rv = saHpiResourcesDiscover((SaHpiSessionIdT)(size_t)sessionid);
+               if (rv != SA_OK)
+                       printf("discovery failed\n");
+