mirror of
https://github.com/ipmitool/ipmitool.git
synced 2025-05-10 18:47:22 +00:00
correct EOL (unix)
-Fixed detection of packing support in GCC -Added packing support detection magic on all packed structures in project
This commit is contained in:
parent
a0673a77b3
commit
fb0d4e7fc1
@ -616,8 +616,8 @@ static unsigned short KfwumCalculateChecksumPadding(unsigned char * pBuffer,
|
|||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
******************************* COMMANDS **************************************
|
******************************* COMMANDS **************************************
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(1)
|
#pragma pack(1)
|
||||||
#endif
|
#endif
|
||||||
struct KfwumGetInfoResp {
|
struct KfwumGetInfoResp {
|
||||||
unsigned char protocolRevision;
|
unsigned char protocolRevision;
|
||||||
@ -632,8 +632,8 @@ struct KfwumGetInfoResp {
|
|||||||
unsigned char firmRev2;
|
unsigned char firmRev2;
|
||||||
unsigned char numBank;
|
unsigned char numBank;
|
||||||
} ATTRIBUTE_PACKING;
|
} ATTRIBUTE_PACKING;
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(0)
|
#pragma pack(0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@ -835,8 +835,8 @@ static tKFWUM_Status KfwumGetDeviceInfo(struct ipmi_intf * intf,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(1)
|
#pragma pack(1)
|
||||||
#endif
|
#endif
|
||||||
struct KfwumGetStatusResp {
|
struct KfwumGetStatusResp {
|
||||||
unsigned char bankState;
|
unsigned char bankState;
|
||||||
@ -847,8 +847,8 @@ struct KfwumGetStatusResp {
|
|||||||
unsigned char firmRev2;
|
unsigned char firmRev2;
|
||||||
unsigned char firmRev3;
|
unsigned char firmRev3;
|
||||||
} ATTRIBUTE_PACKING;
|
} ATTRIBUTE_PACKING;
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(0)
|
#pragma pack(0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@ -933,14 +933,14 @@ static tKFWUM_Status KfwumGetStatus(struct ipmi_intf * intf)
|
|||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(1)
|
#pragma pack(1)
|
||||||
#endif
|
#endif
|
||||||
struct KfwumManualRollbackReq{
|
struct KfwumManualRollbackReq{
|
||||||
unsigned char type;
|
unsigned char type;
|
||||||
} ATTRIBUTE_PACKING;
|
} ATTRIBUTE_PACKING;
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(0)
|
#pragma pack(0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@ -986,8 +986,8 @@ static tKFWUM_Status KfwumManualRollback(struct ipmi_intf * intf)
|
|||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(1)
|
#pragma pack(1)
|
||||||
#endif
|
#endif
|
||||||
struct KfwumStartFirmwareDownloadReq{
|
struct KfwumStartFirmwareDownloadReq{
|
||||||
unsigned char lengthLSB;
|
unsigned char lengthLSB;
|
||||||
@ -997,18 +997,18 @@ struct KfwumStartFirmwareDownloadReq{
|
|||||||
unsigned char paddingMSB;
|
unsigned char paddingMSB;
|
||||||
unsigned char useSequence;
|
unsigned char useSequence;
|
||||||
} ATTRIBUTE_PACKING;
|
} ATTRIBUTE_PACKING;
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(0)
|
#pragma pack(0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(1)
|
#pragma pack(1)
|
||||||
#endif
|
#endif
|
||||||
struct KfwumStartFirmwareDownloadResp {
|
struct KfwumStartFirmwareDownloadResp {
|
||||||
unsigned char bank;
|
unsigned char bank;
|
||||||
} ATTRIBUTE_PACKING;
|
} ATTRIBUTE_PACKING;
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(0)
|
#pragma pack(0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static tKFWUM_Status KfwumStartFirmwareImage(struct ipmi_intf * intf,
|
static tKFWUM_Status KfwumStartFirmwareImage(struct ipmi_intf * intf,
|
||||||
@ -1065,8 +1065,8 @@ static tKFWUM_Status KfwumStartFirmwareImage(struct ipmi_intf * intf,
|
|||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(1)
|
#pragma pack(1)
|
||||||
#endif
|
#endif
|
||||||
struct KfwumSaveFirmwareAddressReq
|
struct KfwumSaveFirmwareAddressReq
|
||||||
{
|
{
|
||||||
@ -1076,20 +1076,20 @@ struct KfwumSaveFirmwareAddressReq
|
|||||||
unsigned char numBytes;
|
unsigned char numBytes;
|
||||||
unsigned char txBuf[KFWUM_SMALL_BUFFER-KFWUM_OLD_CMD_OVERHEAD];
|
unsigned char txBuf[KFWUM_SMALL_BUFFER-KFWUM_OLD_CMD_OVERHEAD];
|
||||||
} ATTRIBUTE_PACKING;
|
} ATTRIBUTE_PACKING;
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(0)
|
#pragma pack(0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(1)
|
#pragma pack(1)
|
||||||
#endif
|
#endif
|
||||||
struct KfwumSaveFirmwareSequenceReq
|
struct KfwumSaveFirmwareSequenceReq
|
||||||
{
|
{
|
||||||
unsigned char sequenceNumber;
|
unsigned char sequenceNumber;
|
||||||
unsigned char txBuf[KFWUM_BIG_BUFFER];
|
unsigned char txBuf[KFWUM_BIG_BUFFER];
|
||||||
} ATTRIBUTE_PACKING;
|
} ATTRIBUTE_PACKING;
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(0)
|
#pragma pack(0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@ -1234,8 +1234,8 @@ static tKFWUM_Status KfwumSaveFirmwareImage(struct ipmi_intf * intf,
|
|||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(1)
|
#pragma pack(1)
|
||||||
#endif
|
#endif
|
||||||
struct KfwumFinishFirmwareDownloadReq{
|
struct KfwumFinishFirmwareDownloadReq{
|
||||||
unsigned char versionMaj;
|
unsigned char versionMaj;
|
||||||
@ -1243,8 +1243,8 @@ struct KfwumFinishFirmwareDownloadReq{
|
|||||||
unsigned char versionSdr;
|
unsigned char versionSdr;
|
||||||
unsigned char reserved;
|
unsigned char reserved;
|
||||||
} ATTRIBUTE_PACKING;
|
} ATTRIBUTE_PACKING;
|
||||||
#ifdef PRAGMA_PACK
|
#ifdef HAVE_PRAGMA_PACK
|
||||||
#pramga pack(0)
|
#pragma pack(0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static tKFWUM_Status KfwumFinishFirmwareImage(struct ipmi_intf * intf,
|
static tKFWUM_Status KfwumFinishFirmwareImage(struct ipmi_intf * intf,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user