mirror of
https://salsa.debian.org/gnuk-team/gnuk/gnuk.git
synced 2024-09-20 02:40:08 +00:00
Clean up debug feature.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
fbe3cb1651
commit
f1761a379f
126
src/debug.c
126
src/debug.c
@ -1,126 +0,0 @@
|
||||
/*
|
||||
* debug.c -- Debuging with virtual COM port
|
||||
*
|
||||
* Copyright (C) 2010 Free Software Initiative of Japan
|
||||
* Author: NIIBE Yutaka <gniibe@fsij.org>
|
||||
*
|
||||
* This file is a part of Gnuk, a GnuPG USB Token implementation.
|
||||
*
|
||||
* Gnuk is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Gnuk is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
* License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
extern void _write (const char *s, int len);
|
||||
|
||||
static void
|
||||
put_hex (uint8_t nibble)
|
||||
{
|
||||
uint8_t c;
|
||||
|
||||
if (nibble < 0x0a)
|
||||
c = '0' + nibble;
|
||||
else
|
||||
c = 'a' + nibble - 0x0a;
|
||||
|
||||
_write ((const char *)&c, 1);
|
||||
}
|
||||
|
||||
void
|
||||
put_byte (uint8_t b)
|
||||
{
|
||||
put_hex (b >> 4);
|
||||
put_hex (b &0x0f);
|
||||
_write ("\r\n", 2);
|
||||
}
|
||||
|
||||
void
|
||||
put_byte_with_no_nl (uint8_t b)
|
||||
{
|
||||
_write (" ", 1);
|
||||
put_hex (b >> 4);
|
||||
put_hex (b &0x0f);
|
||||
}
|
||||
|
||||
void
|
||||
put_short (uint16_t x)
|
||||
{
|
||||
put_hex (x >> 12);
|
||||
put_hex ((x >> 8)&0x0f);
|
||||
put_hex ((x >> 4)&0x0f);
|
||||
put_hex (x & 0x0f);
|
||||
_write ("\r\n", 2);
|
||||
}
|
||||
|
||||
void
|
||||
put_word (uint32_t x)
|
||||
{
|
||||
put_hex (x >> 28);
|
||||
put_hex ((x >> 24)&0x0f);
|
||||
put_hex ((x >> 20)&0x0f);
|
||||
put_hex ((x >> 16)&0x0f);
|
||||
put_hex ((x >> 12)&0x0f);
|
||||
put_hex ((x >> 8)&0x0f);
|
||||
put_hex ((x >> 4)&0x0f);
|
||||
put_hex (x & 0x0f);
|
||||
_write ("\r\n", 2);
|
||||
}
|
||||
|
||||
void
|
||||
put_int (uint32_t x)
|
||||
{
|
||||
char s[10];
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 10; i++)
|
||||
{
|
||||
s[i] = '0' + (x % 10);
|
||||
x /= 10;
|
||||
if (x == 0)
|
||||
break;
|
||||
}
|
||||
|
||||
while (i)
|
||||
{
|
||||
_write (s+i, 1);
|
||||
i--;
|
||||
}
|
||||
|
||||
_write (s, 1);
|
||||
_write ("\r\n", 2);
|
||||
}
|
||||
|
||||
void
|
||||
put_binary (const char *s, int len)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
{
|
||||
put_byte_with_no_nl (s[i]);
|
||||
if ((i & 0x0f) == 0x0f)
|
||||
_write ("\r\n", 2);
|
||||
}
|
||||
_write ("\r\n", 2);
|
||||
}
|
||||
|
||||
void
|
||||
put_string (const char *s)
|
||||
{
|
||||
_write (s, strlen (s));
|
||||
}
|
||||
|
||||
|
@ -1,9 +0,0 @@
|
||||
struct stdout {
|
||||
chopstx_mutex_t m;
|
||||
/**/
|
||||
chopstx_mutex_t m_dev;
|
||||
chopstx_cond_t cond_dev;
|
||||
uint8_t connected;
|
||||
};
|
||||
|
||||
extern struct stdout stdout;
|
@ -514,10 +514,7 @@ main (int argc, const char *argv[])
|
||||
void
|
||||
fatal (uint8_t code)
|
||||
{
|
||||
extern void _write (const char *s, int len);
|
||||
|
||||
fatal_code = code;
|
||||
eventflag_signal (&led_event, LED_FATAL);
|
||||
_write ("fatal\r\n", 7);
|
||||
for (;;);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user