staging: unisys: refactor VISORCHIPSET_DEVICE_INFO
[firefly-linux-kernel-4.4.55.git] / drivers / staging / unisys / visorchipset / visorchipset.h
index 2bf2e2f368ef9bce033cd4d9a85bf702d6be3046..a792cf263adbb16c55e92c4bebd7de3036f3a4de 100644 (file)
 /** Describes the state from the perspective of which controlvm messages have
  *  been received for a bus or device.
  */
-typedef struct {
+struct visorchipset_state {
        u32 created:1;
        u32 attached:1;
        u32 configured:1;
        u32 running:1;
        /* Add new fields above. */
        /* Remaining bits in this 32-bit word are unused. */
-} VISORCHIPSET_STATE;
+};
 
-typedef enum {
+enum visorchipset_addresstype {
        /** address is guest physical, but outside of the physical memory
         *  region that is controlled by the running OS (this is the normal
         *  address type for Supervisor channels)
         */
-       ADDRTYPE_localPhysical,
+       ADDRTYPE_LOCALPHYSICAL,
 
        /** address is guest physical, and withIN the confines of the
         *  physical memory controlled by the running OS.
         */
-       ADDRTYPE_localTest,
-} VISORCHIPSET_ADDRESSTYPE;
+       ADDRTYPE_LOCALTEST,
+};
 
-typedef enum {
-       CRASH_dev,
-       CRASH_bus,
-} CRASH_OBJ_TYPE;
+enum crash_obj_type {
+       CRASH_DEV,
+       CRASH_BUS,
+};
 
 /** Attributes for a particular Supervisor channel.
  */
-typedef struct {
-       VISORCHIPSET_ADDRESSTYPE addrType;
-       HOSTADDRESS channelAddr;
-       struct InterruptInfo intr;
-       u64 nChannelBytes;
-       uuid_le channelTypeGuid;
-       uuid_le channelInstGuid;
+struct visorchipset_channel_info {
+       enum visorchipset_addresstype addr_type;
+       HOSTADDRESS channel_addr;
+       struct irq_info intr;
+       u64 n_channel_bytes;
+       uuid_le channel_type_uuid;
+       uuid_le channel_inst_uuid;
 
-} VISORCHIPSET_CHANNEL_INFO;
+};
 
 /** Attributes for a particular Supervisor device.
  *  Any visorchipset client can query these attributes using
  *  visorchipset_get_client_device_info() or
  *  visorchipset_get_server_device_info().
  */
-typedef struct {
+struct visorchipset_device_info {
        struct list_head entry;
-       u32 busNo;
-       u32 devNo;
-       uuid_le devInstGuid;
-       VISORCHIPSET_STATE state;
-       VISORCHIPSET_CHANNEL_INFO chanInfo;
-       u32 Reserved1;          /* CONTROLVM_ID */
-       u64 Reserved2;
-       u32 switchNo;           /* when devState.attached==1 */
-       u32 internalPortNo;     /* when devState.attached==1 */
-       CONTROLVM_MESSAGE_HEADER pendingMsgHdr; /* CONTROLVM_MESSAGE */
+       u32 bus_no;
+       u32 dev_no;
+       uuid_le dev_inst_uuid;
+       struct visorchipset_state state;
+       struct visorchipset_channel_info chan_info;
+       u32 reserved1;          /* control_vm_id */
+       u64 reserved2;
+       u32 switch_no;          /* when devState.attached==1 */
+       u32 internal_port_no;   /* when devState.attached==1 */
+       struct controlvm_message_header pending_msg_hdr;/* CONTROLVM_MESSAGE */
        /** For private use by the bus driver */
        void *bus_driver_context;
 
-} VISORCHIPSET_DEVICE_INFO;
+};
 
-static inline VISORCHIPSET_DEVICE_INFO *
+static inline struct visorchipset_device_info *
 finddevice(struct list_head *list, u32 busNo, u32 devNo)
 {
-       VISORCHIPSET_DEVICE_INFO *p;
+       struct visorchipset_device_info *p;
 
        list_for_each_entry(p, list, entry) {
-               if (p->busNo == busNo && p->devNo == devNo)
+               if (p->bus_no == busNo && p->dev_no == devNo)
                        return p;
        }
        return NULL;
@@ -106,10 +106,10 @@ finddevice(struct list_head *list, u32 busNo, u32 devNo)
 
 static inline void delbusdevices(struct list_head *list, u32 busNo)
 {
-       VISORCHIPSET_DEVICE_INFO *p, *tmp;
+       struct visorchipset_device_info *p, *tmp;
 
        list_for_each_entry_safe(p, tmp, list, entry) {
-               if (p->busNo == busNo) {
+               if (p->bus_no == busNo) {
                        list_del(&p->entry);
                        kfree(p);
                }
@@ -125,8 +125,8 @@ static inline void delbusdevices(struct list_head *list, u32 busNo)
 typedef struct {
        struct list_head entry;
        u32 busNo;
-       VISORCHIPSET_STATE state;
-       VISORCHIPSET_CHANNEL_INFO chanInfo;
+       struct visorchipset_state state;
+       struct visorchipset_channel_info chanInfo;
        uuid_le partitionGuid;
        u64 partitionHandle;
        u8 *name;               /* UTF8 */
@@ -139,7 +139,7 @@ typedef struct {
                /* Add new fields above. */
                /* Remaining bits in this 32-bit word are unused. */
        } flags;
-       CONTROLVM_MESSAGE_HEADER pendingMsgHdr; /* CONTROLVM MsgHdr */
+       struct controlvm_message_header pendingMsgHdr;  /* CONTROLVM MsgHdr */
        /** For private use by the bus driver */
        void *bus_driver_context;
        u64 devNo;
@@ -162,17 +162,17 @@ findbus(struct list_head *list, u32 busNo)
  */
 typedef struct {
        u32 switchNo;
-       VISORCHIPSET_STATE state;
+       struct visorchipset_state state;
        uuid_le switchTypeGuid;
        u8 *authService1;
        u8 *authService2;
        u8 *authService3;
        u8 *securityContext;
        u64 Reserved;
-       u32 Reserved2;          /* CONTROLVM_ID */
+       u32 Reserved2;          /* control_vm_id */
        struct device dev;
        BOOL dev_exists;
-       CONTROLVM_MESSAGE_HEADER pendingMsgHdr;
+       struct controlvm_message_header pendingMsgHdr;
 
 } VISORCHIPSET_SWITCH_INFO;
 
@@ -182,7 +182,7 @@ typedef struct {
 typedef struct {
        u32 switchNo;
        u32 externalPortNo;
-       VISORCHIPSET_STATE state;
+       struct visorchipset_state state;
        uuid_le networkZoneGuid;
        int pdPort;
        u8 *ip;
@@ -192,10 +192,10 @@ typedef struct {
        u8 *ipGateway;
        u8 *ipDNS;
        u64 Reserved1;
-       u32 Reserved2;          /* CONTROLVM_ID */
+       u32 Reserved2;          /* control_vm_id */
        struct device dev;
        BOOL dev_exists;
-       CONTROLVM_MESSAGE_HEADER pendingMsgHdr;
+       struct controlvm_message_header pendingMsgHdr;
 
 } VISORCHIPSET_EXTERNALPORT_INFO;
 
@@ -205,12 +205,12 @@ typedef struct {
 typedef struct {
        u32 switchNo;
        u32 internalPortNo;
-       VISORCHIPSET_STATE state;
+       struct visorchipset_state state;
        u32 busNo;              /* valid only when state.attached == 1 */
        u32 devNo;              /* valid only when state.attached == 1 */
        u64 Reserved1;
        u32 Reserved2;          /* CONTROLVM_ID */
-       CONTROLVM_MESSAGE_HEADER pendingMsgHdr;
+       struct controlvm_message_header pendingMsgHdr;
        MYPROCOBJECT *procObject;
 
 } VISORCHIPSET_INTERNALPORT_INFO;
@@ -254,7 +254,7 @@ typedef struct {
 void
 visorchipset_register_busdev_client(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers,
                                    VISORCHIPSET_BUSDEV_RESPONDERS *responders,
-                                   ULTRA_VBUS_DEVICEINFO *driverInfo);
+                                   struct ultra_vbus_deviceinfo *driverInfo);
 
 /** Register functions (in the bus driver) to get called by visorchipset
  *  whenever a bus or device appears for which this service partition is
@@ -265,16 +265,16 @@ visorchipset_register_busdev_client(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers,
 void
 visorchipset_register_busdev_server(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers,
                                    VISORCHIPSET_BUSDEV_RESPONDERS *responders,
-                                   ULTRA_VBUS_DEVICEINFO *driverInfo);
+                                   struct ultra_vbus_deviceinfo *driverInfo);
 
-typedef void (*SPARREPORTEVENT_COMPLETE_FUNC) (CONTROLVM_MESSAGE *msg,
+typedef void (*SPARREPORTEVENT_COMPLETE_FUNC) (struct controlvm_message *msg,
                                               int status);
 
 void visorchipset_device_pause_response(ulong busNo, ulong devNo, int response);
 
 BOOL visorchipset_get_bus_info(ulong busNo, VISORCHIPSET_BUS_INFO *busInfo);
 BOOL visorchipset_get_device_info(ulong busNo, ulong devNo,
-                                 VISORCHIPSET_DEVICE_INFO *devInfo);
+                                 struct visorchipset_device_info *devInfo);
 BOOL visorchipset_get_switch_info(ulong switchNo,
                                  VISORCHIPSET_SWITCH_INFO *switchInfo);
 BOOL visorchipset_get_externalport_info(ulong switchNo, ulong externalPortNo,
@@ -285,9 +285,10 @@ BOOL visorchipset_set_device_context(ulong busNo, ulong devNo, void *context);
 int visorchipset_chipset_ready(void);
 int visorchipset_chipset_selftest(void);
 int visorchipset_chipset_notready(void);
-void visorchipset_controlvm_respond_reportEvent(CONTROLVM_MESSAGE *msg,
+void visorchipset_controlvm_respond_reportEvent(struct controlvm_message *msg,
                                                void *payload);
-void visorchipset_save_message(CONTROLVM_MESSAGE *msg, CRASH_OBJ_TYPE type);
+void visorchipset_save_message(struct controlvm_message *msg,
+                              enum crash_obj_type type);
 void *visorchipset_cache_alloc(struct kmem_cache *pool,
                               BOOL ok_to_block, char *fn, int ln);
 void visorchipset_cache_free(struct kmem_cache *pool, void *p,