staging: unisys: remove unused CONTROL_VM messages from enum

[sfrench/cifs-2.6.git] / drivers / staging / unisys / common-spar / include / channels / controlvmchannel.h

diff --git a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
index a66db7968d6cfeabf7ac710b8bf1828a6928c1ff..cd1540913bf419b3d5409365a9a6cd6d0f5ab9c6 100644 (file)
--- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
@@ -20,12 +20,6 @@
 #include "channel.h"
 #include "controlframework.h"
 
-typedef u64 GUEST_PHYSICAL_ADDRESS;
-
-enum { INVALID_GUEST_FIRMWARE, SAMPLE_GUEST_FIRMWARE,
-           TIANO32_GUEST_FIRMWARE, TIANO64_GUEST_FIRMWARE
-};
-
 /* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */
 #define SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID   \
                UUID_LE(0x2b3c2d10, 0x7ef5, 0x4ad8, \
@@ -53,13 +47,8 @@ static const uuid_le spar_controlvm_channel_protocol_uuid =
                ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID, \
                ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE)
 
-#define MY_DEVICE_INDEX 0
-#define MAX_MACDATA_LEN 8 /* number of bytes for MAC address in config packet */
 #define MAX_SERIAL_NUM 32
 
-#define DISK_ZERO_PUN_NUMBER   1  /* Target ID on the SCSI bus for LUN 0 */
-#define DISK_ZERO_LUN_NUMBER   3  /* Logical Unit Number */
-
 /* Defines for various channel queues... */
 #define CONTROLVM_QUEUE_REQUEST                0
 #define CONTROLVM_QUEUE_RESPONSE       1
@@ -99,11 +88,6 @@ enum controlvm_id {
        CONTROLVM_DEVICE_CHANGESTATE = 0x204,   /* CP --> SP, GP */
        CONTROLVM_DEVICE_CHANGESTATE_EVENT = 0x205, /* SP, GP --> CP */
        CONTROLVM_DEVICE_RECONFIGURE = 0x206,   /* CP --> Boot */
-/* DISK commands required Parameter: BusNumber, DeviceNumber  */
-       CONTROLVM_DISK_CREATE = 0x221,  /* CP --> SP */
-       CONTROLVM_DISK_DESTROY = 0x222, /* CP --> SP */
-       CONTROLVM_DISK_CONFIGURE = 0x223,       /* CP --> SP */
-       CONTROLVM_DISK_CHANGESTATE = 0x224,     /* CP --> SP */
 /* CHIPSET commands */
        CONTROLVM_CHIPSET_INIT = 0x301, /* CP --> SP, GP */
        CONTROLVM_CHIPSET_STOP = 0x302, /* CP --> SP, GP */
@@ -343,7 +327,7 @@ struct controlvm_message {
 };
 
 struct device_map {
-       GUEST_PHYSICAL_ADDRESS device_channel_address;
+       u64 device_channel_address;
        u64 device_channel_size;
        u32 ca_index;
        u32 reserved;           /* natural alignment */
@@ -362,23 +346,23 @@ struct guest_devices  {
 
 struct spar_controlvm_channel_protocol {
         struct channel_header header;
-        GUEST_PHYSICAL_ADDRESS gp_controlvm;   /* guest physical address of
+        u64 gp_controlvm;      /* guest physical address of
                                                 * this channel */
-        GUEST_PHYSICAL_ADDRESS gp_partition_tables;/* guest physical address of
+        u64 gp_partition_tables;/* guest physical address of
                                                     * partition tables */
-        GUEST_PHYSICAL_ADDRESS gp_diag_guest;  /* guest physical address of
+        u64 gp_diag_guest;     /* guest physical address of
                                                 * diagnostic channel */
-        GUEST_PHYSICAL_ADDRESS gp_boot_romdisk;/* guest phys addr of (read
+        u64 gp_boot_romdisk;/* guest phys addr of (read
                                                 * only) Boot ROM disk */
-        GUEST_PHYSICAL_ADDRESS gp_boot_ramdisk;/* guest phys addr of writable
+        u64 gp_boot_ramdisk;/* guest phys addr of writable
                                                 * Boot RAM disk */
-        GUEST_PHYSICAL_ADDRESS gp_acpi_table;  /* guest phys addr of acpi
+        u64 gp_acpi_table;     /* guest phys addr of acpi
                                                 * table */
-        GUEST_PHYSICAL_ADDRESS gp_control_channel;/* guest phys addr of control
+        u64 gp_control_channel;/* guest phys addr of control
                                                    * channel */
-        GUEST_PHYSICAL_ADDRESS gp_diag_romdisk;/* guest phys addr of diagnostic
+        u64 gp_diag_romdisk;/* guest phys addr of diagnostic
                                                 * ROM disk */
-        GUEST_PHYSICAL_ADDRESS gp_nvram;       /* guest phys addr of NVRAM
+        u64 gp_nvram;  /* guest phys addr of NVRAM
                                                 * channel */
         u64 request_payload_offset;    /* Offset to request payload area */
         u64 event_payload_offset;      /* Offset to event payload area */
@@ -389,28 +373,28 @@ struct spar_controlvm_channel_protocol {
         u32 nvram_channel_bytes;       /* Bytes in PartitionNvram segment */
         u32 message_bytes;     /* sizeof(CONTROLVM_MESSAGE) */
         u32 message_count;     /* CONTROLVM_MESSAGE_MAX */
-        GUEST_PHYSICAL_ADDRESS gp_smbios_table;/* guest phys addr of SMBIOS
+        u64 gp_smbios_table;/* guest phys addr of SMBIOS
                                                 * tables */
-        GUEST_PHYSICAL_ADDRESS gp_physical_smbios_table;/* guest phys addr of
+        u64 gp_physical_smbios_table;/* guest phys addr of
                                                          * SMBIOS table  */
         /* ULTRA_MAX_GUESTS_PER_SERVICE */
         struct guest_devices gp_obsolete_guest_devices[16];
 
         /* guest physical address of EFI firmware image base  */
-        GUEST_PHYSICAL_ADDRESS virtual_guest_firmware_image_base;
+        u64 virtual_guest_firmware_image_base;
 
         /* guest physical address of EFI firmware entry point  */
-        GUEST_PHYSICAL_ADDRESS virtual_guest_firmware_entry_point;
+        u64 virtual_guest_firmware_entry_point;
 
         /* guest EFI firmware image size  */
         u64 virtual_guest_firmware_image_size;
 
         /* GPA = 1MB where EFI firmware image is copied to  */
-        GUEST_PHYSICAL_ADDRESS virtual_guest_firmware_boot_base;
-        GUEST_PHYSICAL_ADDRESS virtual_guest_image_base;
-        GUEST_PHYSICAL_ADDRESS virtual_guest_image_size;
+        u64 virtual_guest_firmware_boot_base;
+        u64 virtual_guest_image_base;
+        u64 virtual_guest_image_size;
         u64 prototype_control_channel_offset;
-        GUEST_PHYSICAL_ADDRESS virtual_guest_partition_handle;
+        u64 virtual_guest_partition_handle;
 
         u16 restore_action;    /* Restore Action field to restore the guest
                                 * partition */