From b3472220af9408d61ed73e918c73c9e429360389 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Thu, 14 Jul 2005 00:21:26 +0000 Subject: [PATCH] make this function a macro --- ipmitool/include/ipmitool/ipmi_sdr.h | 3 ++- ipmitool/lib/ipmi_sdr.c | 18 ------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/ipmitool/include/ipmitool/ipmi_sdr.h b/ipmitool/include/ipmitool/ipmi_sdr.h index 975220e..484c732 100644 --- a/ipmitool/include/ipmitool/ipmi_sdr.h +++ b/ipmitool/include/ipmitool/ipmi_sdr.h @@ -48,7 +48,8 @@ #include int ipmi_sdr_main(struct ipmi_intf *, int, char **); -int32_t utos(uint32_t val, int bits); + +#define utos(val, bits) ((val & ((1<<(bits)-1))) ? (-((~(val) & ((1<<(bits)-1) - 1)) + 1)) : (val)) #if WORDS_BIGENDIAN # define __TO_TOL(mtol) (uint16_t)(mtol & 0x3f) diff --git a/ipmitool/lib/ipmi_sdr.c b/ipmitool/lib/ipmi_sdr.c index f161873..5d32d46 100644 --- a/ipmitool/lib/ipmi_sdr.c +++ b/ipmitool/lib/ipmi_sdr.c @@ -65,24 +65,6 @@ static struct sdr_record_list *sdr_list_head = NULL; static struct sdr_record_list *sdr_list_tail = NULL; static struct ipmi_sdr_iterator *sdr_list_itr = NULL; -/* utos - convert unsigned 32bit value to 2's complement signed - * - * @val: unsigned value to convert - * @bits: number of bits in value - * - * returns 2s complement signed integer - */ -int32_t -utos(uint32_t val, int bits) -{ - int x = 1<<(bits-1); - - if (val & x) - return -((~val & ((1<<(bits-1)) - 1)) + 1); - else - return val; -} - /* ipmi_sdr_get_unit_string - return units for base/modifier * * @type: unit type