From 58ef4f8af68e1aadab899c202ae5132cdfa192a3 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Wed, 12 Jan 2005 21:13:25 +0000 Subject: [PATCH] move enum flg_e enum define to header file and make sure ipmi_pef_print_flags() prototype is correct --- ipmitool/include/ipmitool/ipmi_pef.h | 9 ++++++++- ipmitool/lib/ipmi_pef.c | 6 ------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ipmitool/include/ipmitool/ipmi_pef.h b/ipmitool/include/ipmitool/ipmi_pef.h index ce7d672..ab7fe2f 100644 --- a/ipmitool/include/ipmitool/ipmi_pef.h +++ b/ipmitool/include/ipmitool/ipmi_pef.h @@ -47,6 +47,13 @@ struct pef_capabilities { /* "get pef capabilities" response */ uint8_t tblsize; }; +typedef enum { + P_TRUE, + P_SUPP, + P_ACTV, + P_ABLE, +} flg_e; + struct pef_table_entry { #define PEF_CONFIG_ENABLED 0x80 #define PEF_CONFIG_PRECONFIGURED 0x40 @@ -769,7 +776,7 @@ BIT_DESC_MAP_LIST, #define IPMI_CMD_SERIAL_GET_CONFIG 0x11 const char * ipmi_pef_bit_desc(struct bit_desc_map * map, uint32_t val); -void ipmi_pef_print_flags(struct bit_desc_map * map, uint32_t type, uint32_t val); +void ipmi_pef_print_flags(struct bit_desc_map * map, flg_e type, uint32_t val); void ipmi_pef_print_dec(const char * text, uint32_t val); void ipmi_pef_print_hex(const char * text, uint32_t val); void ipmi_pef_print_1xd(const char * text, uint32_t val); diff --git a/ipmitool/lib/ipmi_pef.c b/ipmitool/lib/ipmi_pef.c index f128e18..8ec2c83 100644 --- a/ipmitool/lib/ipmi_pef.c +++ b/ipmitool/lib/ipmi_pef.c @@ -76,12 +76,6 @@ static const char * pef_flag_fmts[][3] = { {"active", "in", ""}, {"abled", "dis", "en"}, }; -typedef enum { - P_TRUE, - P_SUPP, - P_ACTV, - P_ABLE, -} flg_e; static const char * listitem[] = {" | %s", ",%s", "%s"}; const char *