diff options
Diffstat (limited to 'src/arch/i386/lib/console.c')
| -rw-r--r-- | src/arch/i386/lib/console.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/src/arch/i386/lib/console.c b/src/arch/i386/lib/console.c index 8c8eccdd2a..83502eafd9 100644 --- a/src/arch/i386/lib/console.c +++ b/src/arch/i386/lib/console.c @@ -22,11 +22,21 @@ static void __console_tx_char(int loglevel, unsigned char byte) } } -static void __console_tx_hex8(int loglevel, unsigned char byte) +static void __console_tx_hex8(int loglevel, unsigned char value) { if (ASM_CONSOLE_LOGLEVEL > loglevel) { - __console_tx_nibble(byte >> 4U); - __console_tx_nibble(byte & 0x0fU); + __console_tx_nibble((value >> 4U) & 0x0fU); + __console_tx_nibble(value & 0x0fU); + } +} + +static void __console_tx_hex16(int loglevel, unsigned short value) +{ + if (ASM_CONSOLE_LOGLEVEL > loglevel) { + __console_tx_nibble((value >> 12U) & 0x0fU); + __console_tx_nibble((value >> 8U) & 0x0fU); + __console_tx_nibble((value >> 4U) & 0x0fU); + __console_tx_nibble(value & 0x0fU); } } @@ -56,46 +66,55 @@ static void __console_tx_string(int loglevel, const char *str) static void print_emerg_char(unsigned char byte) { __console_tx_char(BIOS_EMERG, byte); } static void print_emerg_hex8(unsigned char value){ __console_tx_hex8(BIOS_EMERG, value); } +static void print_emerg_hex16(unsigned short value){ __console_tx_hex16(BIOS_EMERG, value); } static void print_emerg_hex32(unsigned int value) { __console_tx_hex32(BIOS_EMERG, value); } static void print_emerg(const char *str) { __console_tx_string(BIOS_EMERG, str); } static void print_alert_char(unsigned char byte) { __console_tx_char(BIOS_ALERT, byte); } static void print_alert_hex8(unsigned char value) { __console_tx_hex8(BIOS_ALERT, value); } +static void print_alert_hex16(unsigned short value){ __console_tx_hex16(BIOS_ALERT, value); } static void print_alert_hex32(unsigned int value) { __console_tx_hex32(BIOS_ALERT, value); } static void print_alert(const char *str) { __console_tx_string(BIOS_ALERT, str); } static void print_crit_char(unsigned char byte) { __console_tx_char(BIOS_CRIT, byte); } static void print_crit_hex8(unsigned char value) { __console_tx_hex8(BIOS_CRIT, value); } +static void print_crit_hex16(unsigned short value){ __console_tx_hex16(BIOS_CRIT, value); } static void print_crit_hex32(unsigned int value) { __console_tx_hex32(BIOS_CRIT, value); } static void print_crit(const char *str) { __console_tx_string(BIOS_CRIT, str); } static void print_err_char(unsigned char byte) { __console_tx_char(BIOS_ERR, byte); } static void print_err_hex8(unsigned char value) { __console_tx_hex8(BIOS_ERR, value); } +static void print_err_hex16(unsigned short value){ __console_tx_hex16(BIOS_ERR, value); } static void print_err_hex32(unsigned int value) { __console_tx_hex32(BIOS_ERR, value); } static void print_err(const char *str) { __console_tx_string(BIOS_ERR, str); } static void print_warning_char(unsigned char byte) { __console_tx_char(BIOS_WARNING, byte); } static void print_warning_hex8(unsigned char value) { __console_tx_hex8(BIOS_WARNING, value); } +static void print_warning_hex16(unsigned short value){ __console_tx_hex16(BIOS_WARNING, value); } static void print_warning_hex32(unsigned int value) { __console_tx_hex32(BIOS_WARNING, value); } static void print_warning(const char *str) { __console_tx_string(BIOS_WARNING, str); } static void print_notice_char(unsigned char byte) { __console_tx_char(BIOS_NOTICE, byte); } static void print_notice_hex8(unsigned char value) { __console_tx_hex8(BIOS_NOTICE, value); } +static void print_notice_hex16(unsigned short value){ __console_tx_hex16(BIOS_NOTICE, value); } static void print_notice_hex32(unsigned int value) { __console_tx_hex32(BIOS_NOTICE, value); } static void print_notice(const char *str) { __console_tx_string(BIOS_NOTICE, str); } static void print_info_char(unsigned char byte) { __console_tx_char(BIOS_INFO, byte); } static void print_info_hex8(unsigned char value) { __console_tx_hex8(BIOS_INFO, value); } +static void print_info_hex16(unsigned short value){ __console_tx_hex16(BIOS_INFO, value); } static void print_info_hex32(unsigned int value) { __console_tx_hex32(BIOS_INFO, value); } static void print_info(const char *str) { __console_tx_string(BIOS_INFO, str); } static void print_debug_char(unsigned char byte) { __console_tx_char(BIOS_DEBUG, byte); } static void print_debug_hex8(unsigned char value) { __console_tx_hex8(BIOS_DEBUG, value); } +static void print_debug_hex16(unsigned short value){ __console_tx_hex16(BIOS_DEBUG, value); } static void print_debug_hex32(unsigned int value) { __console_tx_hex32(BIOS_DEBUG, value); } static void print_debug(const char *str) { __console_tx_string(BIOS_DEBUG, str); } static void print_spew_char(unsigned char byte) { __console_tx_char(BIOS_SPEW, byte); } static void print_spew_hex8(unsigned char value) { __console_tx_hex8(BIOS_SPEW, value); } +static void print_spew_hex16(unsigned short value){ __console_tx_hex16(BIOS_SPEW, value); } static void print_spew_hex32(unsigned int value) { __console_tx_hex32(BIOS_SPEW, value); } static void print_spew(const char *str) { __console_tx_string(BIOS_SPEW, str); } |