diff options
| author | Jason Jin <Jason.jin@freescale.com> | 2008-10-15 10:40:24 +0800 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-17 01:14:37 +0200 |
| commit | 9029b68f3f81b3013044f167ea025e836e6c8c0e (patch) | |
| tree | 1d8ca036b43d4396ba94661fc683dd419d202d64 | |
| parent | 69710092172409cfcc43b84cd71287f428a4e319 (diff) | |
| download | blackbird-obmc-uboot-9029b68f3f81b3013044f167ea025e836e6c8c0e.tar.gz blackbird-obmc-uboot-9029b68f3f81b3013044f167ea025e836e6c8c0e.zip | |
Fix the function conflict in x86emu when DEBUG is on
The function parse_line() in common/main.c was exposed globally by commit
6636b62a6efc7f14e6e788788631ae7a7fca4537, Result in conflict with the same
name funciton in drivers/bios_emulator/x86emu/debug.c when define the DEBUG.
This patch fix this by renaming the function in the debug.c file.
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
| -rw-r--r-- | drivers/bios_emulator/x86emu/debug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c index 5cbcc95018..29fe3f169e 100644 --- a/drivers/bios_emulator/x86emu/debug.c +++ b/drivers/bios_emulator/x86emu/debug.c @@ -50,7 +50,7 @@ static void print_encoded_bytes(u16 s, u16 o); static void print_decoded_instruction(void); -static int parse_line(char *s, int *ps, int *n); +static int x86emu_parse_line(char *s, int *ps, int *n); /* should look something like debug's output. */ void X86EMU_trace_regs(void) @@ -257,7 +257,7 @@ void x86emu_single_step(void) offset = M.x86.saved_ip; while (!done) { printk("-"); - cmd = parse_line(s, ps, &ntok); + cmd = x86emu_parse_line(s, ps, &ntok); switch (cmd) { case 'u': disassemble_forward(M.x86.saved_cs, (u16) offset, 10); @@ -331,7 +331,7 @@ int X86EMU_trace_off(void) return M.x86.debug &= ~(DEBUG_STEP_F | DEBUG_DECODE_F | DEBUG_TRACE_F); } -static int parse_line(char *s, int *ps, int *n) +static int x86emu_parse_line(char *s, int *ps, int *n) { int cmd; |
