[aoe] Rename aoe__mount_target to AOE_S_MOUNT_TARGET
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Sun, 2 Jan 2011 05:02:26 +0000 (00:02 -0500)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Sun, 2 Jan 2011 05:02:26 +0000 (00:02 -0500)
src/aoe/driver.c
src/include/aoe.h
src/util/winvblk.c

index 2ade653..25d6382 100644 (file)
@@ -200,7 +200,7 @@ typedef struct AOE_DISK_ {
   } AOE_S_DISK_, * AOE_SP_DISK_;
 
 typedef struct AOE_TARGET_LIST_ {
-    aoe__mount_target Target;
+    AOE_S_MOUNT_TARGET Target;
     struct AOE_TARGET_LIST_ * next;
   } AOE_S_TARGET_LIST_, * AOE_SP_TARGET_LIST_;
 
@@ -1667,7 +1667,7 @@ NTSTATUS STDCALL AoeBusDevCtlScan(IN PIRP irp) {
           );
       }
     irp->IoStatus.Information =
-      sizeof (AOE_S_MOUNT_TARGETS) + (count * sizeof (aoe__mount_target));
+      sizeof (AOE_S_MOUNT_TARGETS) + (count * sizeof (AOE_S_MOUNT_TARGET));
     targets->Count = count;
 
     count = 0;
@@ -1676,7 +1676,7 @@ NTSTATUS STDCALL AoeBusDevCtlScan(IN PIRP irp) {
         RtlCopyMemory(
             &targets->Target[count],
             &target_walker->Target,
-            sizeof (aoe__mount_target)
+            sizeof (AOE_S_MOUNT_TARGET)
           );
         count++;
         target_walker = target_walker->next;
@@ -1685,9 +1685,9 @@ NTSTATUS STDCALL AoeBusDevCtlScan(IN PIRP irp) {
         irp->AssociatedIrp.SystemBuffer,
         targets,
         (io_stack_loc->Parameters.DeviceIoControl.OutputBufferLength <
-          (sizeof (AOE_S_MOUNT_TARGETS) + (count * sizeof (aoe__mount_target))) ?
+          (sizeof (AOE_S_MOUNT_TARGETS) + (count * sizeof (AOE_S_MOUNT_TARGET))) ?
           io_stack_loc->Parameters.DeviceIoControl.OutputBufferLength :
-          (sizeof (AOE_S_MOUNT_TARGETS) + (count * sizeof (aoe__mount_target)))
+          (sizeof (AOE_S_MOUNT_TARGETS) + (count * sizeof (AOE_S_MOUNT_TARGET)))
         )
       );
     wv_free(targets);
index 7a5986d..76f4c2a 100644 (file)
@@ -61,19 +61,18 @@ CTL_CODE(                               \
     FILE_READ_DATA | FILE_WRITE_DATA    \
   )
 
-winvblock__def_struct(aoe__mount_target)
-  {
+typedef struct AOE_MOUNT_TARGET {
     winvblock__uint8 ClientMac[6];
     winvblock__uint8 ServerMac[6];
     winvblock__uint32 Major;
     winvblock__uint32 Minor;
     LONGLONG LBASize;
     LARGE_INTEGER ProbeTime;
-  };
+  } AOE_S_MOUNT_TARGET, * AOE_SP_MOUNT_TARGET;
 
 typedef struct AOE_MOUNT_TARGETS {
     winvblock__uint32 Count;
-    aoe__mount_target Target[];
+    AOE_S_MOUNT_TARGET Target[];
   } AOE_S_MOUNT_TARGETS, * AOE_SP_MOUNT_TARGETS;
 
 winvblock__def_struct(aoe__mount_disk)
index f97b65d..1b95a2b 100644 (file)
@@ -231,7 +231,7 @@ static int STDCALL cmd_scan(void) {
 
     targets = malloc(
         sizeof (AOE_S_MOUNT_TARGETS) +
-        (32 * sizeof (aoe__mount_target))
+        (32 * sizeof (AOE_S_MOUNT_TARGET))
       );
     if (targets == NULL) {
         printf("Out of memory\n");
@@ -244,7 +244,7 @@ static int STDCALL cmd_scan(void) {
         NULL,
         0,
         targets,
-        sizeof (AOE_S_MOUNT_TARGETS) + (32 * sizeof (aoe__mount_target)),
+        sizeof (AOE_S_MOUNT_TARGETS) + (32 * sizeof (AOE_S_MOUNT_TARGET)),
         &bytes_returned,
         (LPOVERLAPPED) NULL
       )) {