Commit 9019be28 authored by Andrew Morton's avatar Andrew Morton Committed by James Bottomley

[PATCH] I2O: run linux/i2o.h and linux/i2o-dev.h through

From: Markus Lidel <Markus.Lidel@shadowconnect.com>

- i2o.h and i2o-dev.h are now formated using Lindent.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent b590b47b
...@@ -44,27 +44,23 @@ ...@@ -44,27 +44,23 @@
#define I2OPASSTHRU _IOR(I2O_MAGIC_NUMBER,12,struct i2o_cmd_passthru) #define I2OPASSTHRU _IOR(I2O_MAGIC_NUMBER,12,struct i2o_cmd_passthru)
#define I2OPASSTHRU32 _IOR(I2O_MAGIC_NUMBER,12,struct i2o_cmd_passthru32) #define I2OPASSTHRU32 _IOR(I2O_MAGIC_NUMBER,12,struct i2o_cmd_passthru32)
struct i2o_cmd_passthru32 struct i2o_cmd_passthru32 {
{
unsigned int iop; /* IOP unit number */ unsigned int iop; /* IOP unit number */
u32 msg; /* message */ u32 msg; /* message */
}; };
struct i2o_cmd_passthru struct i2o_cmd_passthru {
{
unsigned int iop; /* IOP unit number */ unsigned int iop; /* IOP unit number */
void __user *msg; /* message */ void __user *msg; /* message */
}; };
struct i2o_cmd_hrtlct struct i2o_cmd_hrtlct {
{ unsigned int iop; /* IOP unit number */
unsigned int iop; /* IOP unit number */ void __user *resbuf; /* Buffer for result */
void __user *resbuf; /* Buffer for result */
unsigned int __user *reslen; /* Buffer length in bytes */ unsigned int __user *reslen; /* Buffer length in bytes */
}; };
struct i2o_cmd_psetget struct i2o_cmd_psetget {
{
unsigned int iop; /* IOP unit number */ unsigned int iop; /* IOP unit number */
unsigned int tid; /* Target device TID */ unsigned int tid; /* Target device TID */
void __user *opbuf; /* Operation List buffer */ void __user *opbuf; /* Operation List buffer */
...@@ -73,8 +69,7 @@ struct i2o_cmd_psetget ...@@ -73,8 +69,7 @@ struct i2o_cmd_psetget
unsigned int __user *reslen; /* Result List buffer length in bytes */ unsigned int __user *reslen; /* Result List buffer length in bytes */
}; };
struct i2o_sw_xfer struct i2o_sw_xfer {
{
unsigned int iop; /* IOP unit number */ unsigned int iop; /* IOP unit number */
unsigned char flags; /* Flags field */ unsigned char flags; /* Flags field */
unsigned char sw_type; /* Software type */ unsigned char sw_type; /* Software type */
...@@ -85,21 +80,19 @@ struct i2o_sw_xfer ...@@ -85,21 +80,19 @@ struct i2o_sw_xfer
unsigned int __user *curfrag; /* Current fragment count */ unsigned int __user *curfrag; /* Current fragment count */
}; };
struct i2o_html struct i2o_html {
{
unsigned int iop; /* IOP unit number */ unsigned int iop; /* IOP unit number */
unsigned int tid; /* Target device ID */ unsigned int tid; /* Target device ID */
unsigned int page; /* HTML page */ unsigned int page; /* HTML page */
void __user *resbuf; /* Buffer for reply HTML page */ void __user *resbuf; /* Buffer for reply HTML page */
unsigned int __user *reslen; /* Length in bytes of reply buffer */ unsigned int __user *reslen; /* Length in bytes of reply buffer */
void __user *qbuf; /* Pointer to HTTP query string */ void __user *qbuf; /* Pointer to HTTP query string */
unsigned int qlen; /* Length in bytes of query string buffer */ unsigned int qlen; /* Length in bytes of query string buffer */
}; };
#define I2O_EVT_Q_LEN 32 #define I2O_EVT_Q_LEN 32
struct i2o_evt_id struct i2o_evt_id {
{
unsigned int iop; unsigned int iop;
unsigned int tid; unsigned int tid;
unsigned int evt_mask; unsigned int evt_mask;
...@@ -108,21 +101,18 @@ struct i2o_evt_id ...@@ -108,21 +101,18 @@ struct i2o_evt_id
/* Event data size = frame size - message header + evt indicator */ /* Event data size = frame size - message header + evt indicator */
#define I2O_EVT_DATA_SIZE 88 #define I2O_EVT_DATA_SIZE 88
struct i2o_evt_info struct i2o_evt_info {
{
struct i2o_evt_id id; struct i2o_evt_id id;
unsigned char evt_data[I2O_EVT_DATA_SIZE]; unsigned char evt_data[I2O_EVT_DATA_SIZE];
unsigned int data_size; unsigned int data_size;
}; };
struct i2o_evt_get struct i2o_evt_get {
{
struct i2o_evt_info info; struct i2o_evt_info info;
int pending; int pending;
int lost; int lost;
}; };
/************************************************************************** /**************************************************************************
* HRT related constants and structures * HRT related constants and structures
**************************************************************************/ **************************************************************************/
...@@ -142,139 +132,127 @@ typedef unsigned char u8; ...@@ -142,139 +132,127 @@ typedef unsigned char u8;
typedef unsigned short u16; typedef unsigned short u16;
typedef unsigned int u32; typedef unsigned int u32;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
typedef struct _i2o_pci_bus typedef struct _i2o_pci_bus {
{ u8 PciFunctionNumber;
u8 PciFunctionNumber; u8 PciDeviceNumber;
u8 PciDeviceNumber; u8 PciBusNumber;
u8 PciBusNumber; u8 reserved;
u8 reserved; u16 PciVendorID;
u16 PciVendorID; u16 PciDeviceID;
u16 PciDeviceID;
} i2o_pci_bus; } i2o_pci_bus;
typedef struct _i2o_local_bus typedef struct _i2o_local_bus {
{ u16 LbBaseIOPort;
u16 LbBaseIOPort; u16 reserved;
u16 reserved; u32 LbBaseMemoryAddress;
u32 LbBaseMemoryAddress;
} i2o_local_bus; } i2o_local_bus;
typedef struct _i2o_isa_bus typedef struct _i2o_isa_bus {
{ u16 IsaBaseIOPort;
u16 IsaBaseIOPort; u8 CSN;
u8 CSN; u8 reserved;
u8 reserved; u32 IsaBaseMemoryAddress;
u32 IsaBaseMemoryAddress;
} i2o_isa_bus; } i2o_isa_bus;
typedef struct _i2o_eisa_bus_info typedef struct _i2o_eisa_bus_info {
{ u16 EisaBaseIOPort;
u16 EisaBaseIOPort; u8 reserved;
u8 reserved; u8 EisaSlotNumber;
u8 EisaSlotNumber; u32 EisaBaseMemoryAddress;
u32 EisaBaseMemoryAddress;
} i2o_eisa_bus; } i2o_eisa_bus;
typedef struct _i2o_mca_bus typedef struct _i2o_mca_bus {
{ u16 McaBaseIOPort;
u16 McaBaseIOPort; u8 reserved;
u8 reserved; u8 McaSlotNumber;
u8 McaSlotNumber; u32 McaBaseMemoryAddress;
u32 McaBaseMemoryAddress;
} i2o_mca_bus; } i2o_mca_bus;
typedef struct _i2o_other_bus typedef struct _i2o_other_bus {
{
u16 BaseIOPort; u16 BaseIOPort;
u16 reserved; u16 reserved;
u32 BaseMemoryAddress; u32 BaseMemoryAddress;
} i2o_other_bus; } i2o_other_bus;
typedef struct _i2o_hrt_entry typedef struct _i2o_hrt_entry {
{ u32 adapter_id;
u32 adapter_id; u32 parent_tid:12;
u32 parent_tid:12; u32 state:4;
u32 state:4; u32 bus_num:8;
u32 bus_num:8; u32 bus_type:8;
u32 bus_type:8; union {
union i2o_pci_bus pci_bus;
{ i2o_local_bus local_bus;
i2o_pci_bus pci_bus; i2o_isa_bus isa_bus;
i2o_local_bus local_bus; i2o_eisa_bus eisa_bus;
i2o_isa_bus isa_bus; i2o_mca_bus mca_bus;
i2o_eisa_bus eisa_bus; i2o_other_bus other_bus;
i2o_mca_bus mca_bus;
i2o_other_bus other_bus;
} bus; } bus;
} i2o_hrt_entry; } i2o_hrt_entry;
typedef struct _i2o_hrt typedef struct _i2o_hrt {
{ u16 num_entries;
u16 num_entries; u8 entry_len;
u8 entry_len; u8 hrt_version;
u8 hrt_version; u32 change_ind;
u32 change_ind;
i2o_hrt_entry hrt_entry[1]; i2o_hrt_entry hrt_entry[1];
} i2o_hrt; } i2o_hrt;
typedef struct _i2o_lct_entry typedef struct _i2o_lct_entry {
{ u32 entry_size:16;
u32 entry_size:16; u32 tid:12;
u32 tid:12; u32 reserved:4;
u32 reserved:4; u32 change_ind;
u32 change_ind; u32 device_flags;
u32 device_flags; u32 class_id:12;
u32 class_id:12; u32 version:4;
u32 version:4; u32 vendor_id:16;
u32 vendor_id:16; u32 sub_class;
u32 sub_class; u32 user_tid:12;
u32 user_tid:12; u32 parent_tid:12;
u32 parent_tid:12; u32 bios_info:8;
u32 bios_info:8; u8 identity_tag[8];
u8 identity_tag[8]; u32 event_capabilities;
u32 event_capabilities;
} i2o_lct_entry; } i2o_lct_entry;
typedef struct _i2o_lct typedef struct _i2o_lct {
{ u32 table_size:16;
u32 table_size:16; u32 boot_tid:12;
u32 boot_tid:12; u32 lct_ver:4;
u32 lct_ver:4; u32 iop_flags;
u32 iop_flags; u32 change_ind;
u32 change_ind;
i2o_lct_entry lct_entry[1]; i2o_lct_entry lct_entry[1];
} i2o_lct; } i2o_lct;
typedef struct _i2o_status_block typedef struct _i2o_status_block {
{ u16 org_id;
u16 org_id; u16 reserved;
u16 reserved; u16 iop_id:12;
u16 iop_id:12; u16 reserved1:4;
u16 reserved1:4; u16 host_unit_id;
u16 host_unit_id; u16 segment_number:12;
u16 segment_number:12; u16 i2o_version:4;
u16 i2o_version:4; u8 iop_state;
u8 iop_state; u8 msg_type;
u8 msg_type; u16 inbound_frame_size;
u16 inbound_frame_size; u8 init_code;
u8 init_code; u8 reserved2;
u8 reserved2; u32 max_inbound_frames;
u32 max_inbound_frames; u32 cur_inbound_frames;
u32 cur_inbound_frames; u32 max_outbound_frames;
u32 max_outbound_frames; char product_id[24];
char product_id[24]; u32 expected_lct_size;
u32 expected_lct_size; u32 iop_capabilities;
u32 iop_capabilities; u32 desired_mem_size;
u32 desired_mem_size; u32 current_mem_size;
u32 current_mem_size; u32 current_mem_base;
u32 current_mem_base; u32 desired_io_size;
u32 desired_io_size; u32 current_io_size;
u32 current_io_size; u32 current_io_base;
u32 current_io_base; u32 reserved3:24;
u32 reserved3:24; u32 cmd_status:8;
u32 cmd_status:8;
} i2o_status_block; } i2o_status_block;
/* Event indicator mask flags */ /* Event indicator mask flags */
...@@ -421,4 +399,4 @@ typedef struct _i2o_status_block ...@@ -421,4 +399,4 @@ typedef struct _i2o_status_block
#define ADAPTER_STATE_FAILED 0x10 #define ADAPTER_STATE_FAILED 0x10
#define ADAPTER_STATE_FAULTED 0x11 #define ADAPTER_STATE_FAULTED 0x11
#endif /* _I2O_DEV_H */ #endif /* _I2O_DEV_H */
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment