From a59f13b3bd20cb08facf2acd71f44e03b66191f4 Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski Date: Mon, 10 Oct 2011 16:51:55 +0300 Subject: [PATCH] dvb/si: Move bcd functions to dvb/si/numbers.h --- Makefile | 4 +- dvb/si.h | 61 +--------------------------- dvb/si/numbers.h | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 61 deletions(-) create mode 100644 dvb/si/numbers.h diff --git a/Makefile b/Makefile index 2281601..1804578 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,9 @@ install: @install -d $(INCLUDE) @install -m 644 common.h $(INCLUDE)/ @install -d $(INCLUDE)/dvb - @install -m 644 dvb/* $(INCLUDE)/dvb + @install -m 644 dvb/*.h $(INCLUDE)/dvb + @install -d $(INCLUDE)/dvb/si + @install -m 644 dvb/si/*.h $(INCLUDE)/dvb/si @install -d $(INCLUDE)/ietf @install -m 644 ietf/* $(INCLUDE)/ietf @install -d $(INCLUDE)/mpeg diff --git a/dvb/si.h b/dvb/si.h index 5de7c7c..b578fef 100644 --- a/dvb/si.h +++ b/dvb/si.h @@ -37,72 +37,13 @@ #include #include +#include #ifdef __cplusplus extern "C" { #endif -/***************************************************************************** - * DVB numbers - *****************************************************************************/ -static inline unsigned int dvb_bcd_get(const uint8_t *p_bcd, uint8_t i_width) -{ - unsigned int i_result = 0; - - while (i_width >= 8) { - i_result *= 10; - i_result += (*p_bcd) >> 4; - i_result *= 10; - i_result += (*p_bcd) & 0xf; - i_width -= 8; - p_bcd++; - } - - if (i_width == 4) { - i_result *= 10; - i_result += (*p_bcd) >> 4; - } - - return i_result; -} - -static inline void dvb_bcd_set(uint8_t *p_bcd, unsigned int i_int, - uint8_t i_width) -{ - /* calculate 10^(i_width/4-1) */ - unsigned int i_factor = 1, i_exp = i_width / 4 - 1, i_base = 10; - while (i_exp) - { - if (i_exp & 1) - i_factor *= i_base; - i_exp >>= 1; - i_base *= i_base; - } - - while (i_factor >= 10) { - *p_bcd = (i_int / i_factor) << 4; - i_int %= i_factor; - i_factor /= 10; - *p_bcd |= (i_int / i_factor); - i_int %= i_factor; - i_factor /= 10; - p_bcd++; - } - - if (i_factor == 1) { - *p_bcd &= 0xf; - *p_bcd |= i_int << 4; - } -} - -static inline uint8_t dvb_bcd_set8(unsigned int i_int) -{ - uint8_t i_result; - dvb_bcd_set(&i_result, i_int, 8); - return i_result; -} - /* EN 300 468 Annex C, year is from 1900 */ static inline uint16_t dvb_mjd_set(int y, int m, int d) { diff --git a/dvb/si/numbers.h b/dvb/si/numbers.h new file mode 100644 index 0000000..8232586 --- /dev/null +++ b/dvb/si/numbers.h @@ -0,0 +1,102 @@ +/***************************************************************************** + * numbers.h: BCD functions + ***************************************************************************** + * Copyright (C) 2009-2010 VideoLAN + * + * Authors: Christophe Massiot + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + *****************************************************************************/ + +#ifndef __BITSTREAM_DVB_BCD_H__ +#define __BITSTREAM_DVB_BCD_H__ + +#include /* uint8_t, uint16_t, etc... */ + +#ifdef __cplusplus +extern "C" +{ +#endif + +/***************************************************************************** + * DVB numbers + *****************************************************************************/ +static inline unsigned int dvb_bcd_get(const uint8_t *p_bcd, uint8_t i_width) +{ + unsigned int i_result = 0; + + while (i_width >= 8) { + i_result *= 10; + i_result += (*p_bcd) >> 4; + i_result *= 10; + i_result += (*p_bcd) & 0xf; + i_width -= 8; + p_bcd++; + } + + if (i_width == 4) { + i_result *= 10; + i_result += (*p_bcd) >> 4; + } + + return i_result; +} + +static inline void dvb_bcd_set(uint8_t *p_bcd, unsigned int i_int, + uint8_t i_width) +{ + /* calculate 10^(i_width/4-1) */ + unsigned int i_factor = 1, i_exp = i_width / 4 - 1, i_base = 10; + while (i_exp) + { + if (i_exp & 1) + i_factor *= i_base; + i_exp >>= 1; + i_base *= i_base; + } + + while (i_factor >= 10) { + *p_bcd = (i_int / i_factor) << 4; + i_int %= i_factor; + i_factor /= 10; + *p_bcd |= (i_int / i_factor); + i_int %= i_factor; + i_factor /= 10; + p_bcd++; + } + + if (i_factor == 1) { + *p_bcd &= 0xf; + *p_bcd |= i_int << 4; + } +} + +static inline uint8_t dvb_bcd_set8(unsigned int i_int) +{ + uint8_t i_result; + dvb_bcd_set(&i_result, i_int, 8); + return i_result; +} + +#ifdef __cplusplus +} +#endif + +#endif