staging: unisys: remove unused #define in iochannel.h
This patch simply remove all unused #define's in iochannel.h Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Erik Arfvidson
Greg Kroah-Hartman
parent
79245bfce8
commit
67ec962a5b
|
|
@ -86,41 +86,10 @@
|
|||
* ioguestparts */
|
||||
#define IOCHAN_TO_IOPART 0 /* used by ioguestpart to 'insert' signals to
|
||||
* iopart */
|
||||
#define IOCHAN_FROM_GUESTPART 0 /* used by iopart to 'remove' signals from
|
||||
* ioguestpart - same queue as previous queue */
|
||||
|
||||
#define IOCHAN_TO_GUESTPART 1 /* used by iopart to 'insert' signals to
|
||||
* ioguestpart */
|
||||
#define IOCHAN_FROM_IOPART 1 /* used by ioguestpart to 'remove' signals from
|
||||
* iopart - same queue as previous queue */
|
||||
|
||||
/* these define the two queues per control channel between controlpart and "its"
|
||||
* guests, which includes the iopart */
|
||||
#define CTRLCHAN_TO_CTRLGUESTPART 0 /* used by ctrlguestpart to 'insert' signals
|
||||
* to ctrlpart */
|
||||
#define CTLRCHAN_FROM_CTRLPART 0 /* used by ctrlpart to 'remove' signals from
|
||||
* ctrlquestpart - same queue as previous
|
||||
* queue */
|
||||
|
||||
#define CTRLCHAN_TO_CTRLPART 1 /* used by ctrlpart to 'insert' signals to
|
||||
* ctrlguestpart */
|
||||
#define CTRLCHAN_FROM_CTRLGUESTPART 1 /* used by ctrguestpart to 'remove'
|
||||
* signals from ctrlpart - same queue as
|
||||
* previous queue */
|
||||
|
||||
/* these define the Event & Ack queues per control channel Events are generated
|
||||
* by CTRLGUESTPART and sent to CTRLPART; Acks are generated by CTRLPART and sent
|
||||
* to CTRLGUESTPART. */
|
||||
#define CTRLCHAN_EVENT_TO_CTRLPART 2 /* used by ctrlguestpart to 'insert' Events
|
||||
* to ctrlpart */
|
||||
#define CTRLCHAN_EVENT_FROM_CTRLGUESTPART 2 /* used by ctrlpart to 'remove'
|
||||
* Events from ctrlguestpart */
|
||||
|
||||
#define CTRLCHAN_ACK_TO_CTRLGUESTPART 3 /* used by ctrlpart to 'insert' Acks to
|
||||
* ctrlguestpart */
|
||||
#define CTRLCHAN_ACK_FROM_CTRLPART 3 /* used by ctrlguestpart to 'remove' Events
|
||||
* from ctrlpart */
|
||||
|
||||
/* size of cdb - i.e., scsi cmnd */
|
||||
#define MAX_CMND_SIZE 16
|
||||
|
||||
|
|
@ -128,24 +97,6 @@
|
|||
|
||||
#define MAX_PHYS_INFO 64
|
||||
|
||||
/* Because GuestToGuestCopy is limited to 4KiB segments, and we have limited the
|
||||
* Emulex Driver to 256 scatter list segments via the lpfc_sg_seg_cnt parameter
|
||||
* to 256, the maximum I/O size is limited to 256 * 4 KiB = 1 MB */
|
||||
#define MAX_IO_SIZE (1024*1024) /* 1 MB */
|
||||
|
||||
/* NOTE 1: lpfc defines its support for segments in
|
||||
* #define LPFC_SG_SEG_CNT 64
|
||||
*
|
||||
* NOTE 2: In Linux, frags array in skb is currently allocated to be
|
||||
* MAX_SKB_FRAGS size, which is 18 which is smaller than MAX_PHYS_INFO for
|
||||
* now. */
|
||||
|
||||
#define MAX_SCSI_BUSES 1
|
||||
#define MAX_SCSI_TARGETS 8
|
||||
#define MAX_SCSI_LUNS 16
|
||||
#define MAX_SCSI_FROM_HOST 0xFFFFFFFF /* Indicator to use Physical HBA
|
||||
* SCSI Host value */
|
||||
|
||||
/* various types of network packets that can be sent in cmdrsp */
|
||||
enum net_types {
|
||||
NET_RCV_POST = 0, /* submit buffer to hold receiving
|
||||
|
|
@ -178,19 +129,12 @@ enum net_types {
|
|||
#define ETH_MIN_DATA_SIZE 46 /* minimum eth data size */
|
||||
#define ETH_MIN_PACKET_SIZE (ETH_HEADER_SIZE + ETH_MIN_DATA_SIZE)
|
||||
|
||||
#define ETH_DEF_DATA_SIZE 1500 /* default data size */
|
||||
#define ETH_DEF_PACKET_SIZE (ETH_HEADER_SIZE + ETH_DEF_DATA_SIZE)
|
||||
|
||||
#define ETH_MAX_MTU 16384 /* maximum data size */
|
||||
|
||||
#ifndef MAX_MACADDR_LEN
|
||||
#define MAX_MACADDR_LEN 6 /* number of bytes in MAC address */
|
||||
#endif /* MAX_MACADDR_LEN */
|
||||
|
||||
#define ETH_IS_LOCALLY_ADMINISTERED(address) \
|
||||
(((u8 *)(address))[0] & ((u8)0x02))
|
||||
#define NIC_VENDOR_ID 0x0008000B
|
||||
|
||||
/* various types of scsi task mgmt commands */
|
||||
enum task_mgmt_types {
|
||||
TASK_MGMT_ABORT_TASK = 1,
|
||||
|
|
@ -205,20 +149,6 @@ enum vdisk_mgmt_types {
|
|||
VDISK_MGMT_RELEASE,
|
||||
};
|
||||
|
||||
/* this is used in the vdest field */
|
||||
#define VDEST_ALL 0xFFFF
|
||||
|
||||
#define MIN_NUMSIGNALS 64
|
||||
#define MAX_NUMSIGNALS 4096
|
||||
|
||||
/* MAX_NET_RCV_BUF specifies the number of rcv buffers that are created by each
|
||||
* guest's virtnic and posted to uisnic. Uisnic, for each channel, keeps the rcv
|
||||
* buffers posted and uses them to receive data on behalf of the guest's virtnic.
|
||||
* NOTE: the num_rcv_bufs is configurable for each VNIC. So the following is
|
||||
* simply an upperlimit on what each VNIC can provide. Setting it to half of the
|
||||
* NUMSIGNALS to prevent queue full deadlocks */
|
||||
#define MAX_NET_RCV_BUFS (MIN_NUMSIGNALS / 2)
|
||||
|
||||
/*
|
||||
* structs with pragma pack */
|
||||
|
||||
|
|
@ -283,13 +213,7 @@ struct uiscmdrsp_scsi {
|
|||
u8 scsistat; /* the scsi status */
|
||||
u8 addlstat; /* non-scsi status - covers cases like timeout
|
||||
* needed by windows guests */
|
||||
#define ADDL_RESET 1
|
||||
#define ADDL_TIMEOUT 2
|
||||
#define ADDL_INTERNAL_ERROR 3
|
||||
#define ADDL_SEL_TIMEOUT 4
|
||||
#define ADDL_CMD_TIMEOUT 5
|
||||
#define ADDL_BAD_TARGET 6
|
||||
#define ADDL_RETRY 7
|
||||
|
||||
/* the following fields are need to determine the result of command */
|
||||
u8 sensebuf[MAX_SENSE_SIZE]; /* sense info in case cmd failed; */
|
||||
|
|
@ -320,7 +244,6 @@ struct uiscmdrsp_scsi {
|
|||
*connected to this logical unit.
|
||||
*/
|
||||
|
||||
#define DEV_NOT_PRESENT 0x7f /* old name - compatibility */
|
||||
#define DEV_NOT_CAPABLE 0x7f /* peripheral qualifier of 0x3 */
|
||||
/* peripheral type of 0x1f */
|
||||
/* specifies no device but target present */
|
||||
|
|
@ -329,10 +252,6 @@ struct uiscmdrsp_scsi {
|
|||
/* peripheral type of 0 - disk */
|
||||
/* specifies device capable, but not present */
|
||||
|
||||
#define DEV_PROC_CAPABLE_NOT_PRESENT 0x23 /* peripheral qualifier of 0x1 */
|
||||
/* peripheral type of 3 - processor */
|
||||
/* specifies device capable, but not present */
|
||||
|
||||
#define DEV_HISUPPORT 0x10 /* HiSup = 1; shows support for report luns */
|
||||
/* must be returned for lun 0. */
|
||||
|
||||
|
|
@ -423,37 +342,6 @@ struct sense_data {
|
|||
u8 sense_key_specific[3];
|
||||
};
|
||||
|
||||
/* some SCSI ADSENSE codes */
|
||||
#ifndef SCSI_ADSENSE_LUN_NOT_READY
|
||||
#define SCSI_ADSENSE_LUN_NOT_READY 0x04
|
||||
#endif /* */
|
||||
#ifndef SCSI_ADSENSE_ILLEGAL_COMMAND
|
||||
#define SCSI_ADSENSE_ILLEGAL_COMMAND 0x20
|
||||
#endif /* */
|
||||
#ifndef SCSI_ADSENSE_ILLEGAL_BLOCK
|
||||
#endif /* */
|
||||
#ifndef SCSI_ADSENSE_ILLEGAL_BLOCK
|
||||
#define SCSI_ADSENSE_ILLEGAL_BLOCK 0x21
|
||||
#endif /* */
|
||||
#ifndef SCSI_ADSENSE_INVALID_CDB
|
||||
#define SCSI_ADSENSE_INVALID_CDB 0x24
|
||||
#endif /* */
|
||||
#ifndef SCSI_ADSENSE_INVALID_LUN
|
||||
#define SCSI_ADSENSE_INVALID_LUN 0x25
|
||||
#endif /* */
|
||||
#ifndef SCSI_ADWRITE_PROTECT
|
||||
#define SCSI_ADWRITE_PROTECT 0x27
|
||||
#endif /* */
|
||||
#ifndef SCSI_ADSENSE_MEDIUM_CHANGED
|
||||
#define SCSI_ADSENSE_MEDIUM_CHANGED 0x28
|
||||
#endif /* */
|
||||
#ifndef SCSI_ADSENSE_BUS_RESET
|
||||
#define SCSI_ADSENSE_BUS_RESET 0x29
|
||||
#endif /* */
|
||||
#ifndef SCSI_ADSENSE_NO_MEDIA_IN_DEVICE
|
||||
#define SCSI_ADSENSE_NO_MEDIA_IN_DEVICE 0x3a
|
||||
#endif /* */
|
||||
|
||||
struct net_pkt_xmt {
|
||||
int len; /* full length of data in the packet */
|
||||
int num_frags; /* number of fragments in frags containing data */
|
||||
|
|
@ -484,8 +372,6 @@ struct net_pkt_xmt {
|
|||
|
||||
struct net_pkt_xmtdone {
|
||||
u32 xmt_done_result; /* result of NET_XMIT */
|
||||
#define XMIT_SUCCESS 0
|
||||
#define XMIT_FAILED 1
|
||||
};
|
||||
|
||||
/* RCVPOST_BUF_SIZe must be at most page_size(4096) - cache_line_size (64) The
|
||||
|
|
@ -582,7 +468,6 @@ struct uiscmdrsp_scsitaskmgmt {
|
|||
|
||||
/* result of taskmgmt command - set by IOPart - values are: */
|
||||
#define TASK_MGMT_FAILED 0
|
||||
#define TASK_MGMT_SUCCESS 1
|
||||
};
|
||||
|
||||
/* The following is used by uissd to send disk add/remove notifications to
|
||||
|
|
@ -629,7 +514,6 @@ struct uiscmdrsp_vdiskmgmt {
|
|||
|
||||
/* result of taskmgmt command - set by IOPart - values are: */
|
||||
#define VDISK_MGMT_FAILED 0
|
||||
#define VDISK_MGMT_SUCCESS 1
|
||||
};
|
||||
|
||||
/* keeping cmd & rsp info in one structure for now cmd rsp packet for scsi */
|
||||
|
|
@ -684,26 +568,6 @@ struct spar_io_channel_protocol {
|
|||
#pragma pack(pop)
|
||||
/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
|
||||
|
||||
/* define offsets to members of struct uiscmdrsp */
|
||||
#define OFFSET_CMDTYPE offsetof(struct uiscmdrsp, cmdtype)
|
||||
#define OFFSET_SCSI offsetof(struct uiscmdrsp, scsi)
|
||||
#define OFFSET_NET offsetof(struct uiscmdrsp, net)
|
||||
#define OFFSET_SCSITASKMGMT offsetof(struct uiscmdrsp, scsitaskmgmt)
|
||||
#define OFFSET_NEXT offsetof(struct uiscmdrsp, next)
|
||||
|
||||
/* define offsets to members of struct uiscmdrsp_net */
|
||||
#define OFFSET_TYPE offsetof(struct uiscmdrsp_net, type)
|
||||
#define OFFSET_BUF offsetof(struct uiscmdrsp_net, buf)
|
||||
#define OFFSET_XMT offsetof(struct uiscmdrsp_net, xmt)
|
||||
#define OFFSET_XMT_DONE_RESULT offsetof(struct uiscmdrsp_net, xmtdone)
|
||||
#define OFFSET_RCVPOST offsetof(struct uiscmdrsp_net, rcvpost)
|
||||
#define OFFSET_RCV_DONE_LEN offsetof(struct uiscmdrsp_net, rcv)
|
||||
#define OFFSET_ENBDIS offsetof(struct uiscmdrsp_net, enbdis)
|
||||
|
||||
/* define offsets to members of struct net_pkt_rcvpost */
|
||||
#define OFFSET_TOTALLEN offsetof(struct net_pkt_rcvpost, totallen)
|
||||
#define OFFSET_FRAG offsetof(struct net_pkt_rcvpost, frag)
|
||||
|
||||
/*
|
||||
* INLINE functions for initializing and accessing I/O data channels
|
||||
*/
|
||||
|
|
@ -724,7 +588,6 @@ struct spar_io_channel_protocol {
|
|||
/* Guest and IOPartition. */
|
||||
#define PI_PAGE_SIZE 0x1000
|
||||
#define PI_PAGE_MASK 0x0FFF
|
||||
#define PI_PAGE_SHIFT 12
|
||||
|
||||
/* returns next non-zero index on success or zero on failure (i.e. out of
|
||||
* room)
|
||||
|
|
|
|||
Loading…
Reference in New Issue