From 8b68086fdb18f52e9739813014f5a33eac456e70 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Tue, 3 May 2005 15:19:15 +0000 Subject: [PATCH] change IPMI_CHANNEL_MEDIUM_IPMB define to not conflict with openipmi --- ipmitool/include/ipmitool/ipmi_constants.h | 4 +--- ipmitool/lib/ipmi_strings.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ipmitool/include/ipmitool/ipmi_constants.h b/ipmitool/include/ipmitool/ipmi_constants.h index 820cdac..61e8198 100644 --- a/ipmitool/include/ipmitool/ipmi_constants.h +++ b/ipmitool/include/ipmitool/ipmi_constants.h @@ -81,10 +81,8 @@ #define IPMI_SET_IN_PROGRESS_IN_PROGRESS 0x01 #define IPMI_SET_IN_PROGRESS_COMMIT_WRITE 0x02 -#undef IPMI_CHANNEL_MEDIUM_IPMB - #define IPMI_CHANNEL_MEDIUM_RESERVED 0x0 -#define IPMI_CHANNEL_MEDIUM_IPMB 0x1 +#define IPMI_CHANNEL_MEDIUM_IPMB_I2C 0x1 #define IPMI_CHANNEL_MEDIUM_ICMB_1 0x2 #define IPMI_CHANNEL_MEDIUM_ICMB_09 0x3 #define IPMI_CHANNEL_MEDIUM_LAN 0x4 diff --git a/ipmitool/lib/ipmi_strings.c b/ipmitool/lib/ipmi_strings.c index 627a6fe..d4335d0 100644 --- a/ipmitool/lib/ipmi_strings.c +++ b/ipmitool/lib/ipmi_strings.c @@ -211,7 +211,7 @@ const struct valstr ipmi_channel_protocol_vals[] = { const struct valstr ipmi_channel_medium_vals[] = { { IPMI_CHANNEL_MEDIUM_RESERVED, "reserved" }, - { IPMI_CHANNEL_MEDIUM_IPMB, "IPMB (I2C)" }, + { IPMI_CHANNEL_MEDIUM_IPMB_I2C, "IPMB (I2C)" }, { IPMI_CHANNEL_MEDIUM_ICMB_1, "ICMB v1.0" }, { IPMI_CHANNEL_MEDIUM_ICMB_09, "ICMB v0.9" }, { IPMI_CHANNEL_MEDIUM_LAN, "802.3 LAN" },