summaryrefslogtreecommitdiffstats
path: root/src/arch
diff options
context:
space:
mode:
authorMichael Brown2005-04-14 13:55:57 +0200
committerMichael Brown2005-04-14 13:55:57 +0200
commit44c7cc8c1263c32fcad6f4b326666b4020222c21 (patch)
treea229e0ed7f8a52f7c2e7f2e4928820cc3c9a8035 /src/arch
parentcompiler.h is now always included on the command line. (diff)
downloadipxe-44c7cc8c1263c32fcad6f4b326666b4020222c21.tar.gz
ipxe-44c7cc8c1263c32fcad6f4b326666b4020222c21.tar.xz
ipxe-44c7cc8c1263c32fcad6f4b326666b4020222c21.zip
Standardised debug mechanism in place now.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/i386/core/pci_io.c7
-rw-r--r--src/arch/i386/core/pic8259.c6
-rw-r--r--src/arch/i386/core/relocate.c7
-rw-r--r--src/arch/i386/drivers/net/undi.c1
-rw-r--r--src/arch/i386/firmware/pcbios/basemem.c7
5 files changed, 1 insertions, 27 deletions
diff --git a/src/arch/i386/core/pci_io.c b/src/arch/i386/core/pci_io.c
index acc396cf1..ffbf53c55 100644
--- a/src/arch/i386/core/pci_io.c
+++ b/src/arch/i386/core/pci_io.c
@@ -18,13 +18,6 @@
#include "realmode.h"
#endif
-#undef DBG
-#ifdef DEBUG_PCI_IO
-#define DBG(...) printf ( __VA_ARGS__ )
-#else
-#define DBG(...)
-#endif
-
/* Macros for direct PCI access */
#define CONFIG_ADDRESS 0xcf8
#define CONFIG_DATA 0xcfc
diff --git a/src/arch/i386/core/pic8259.c b/src/arch/i386/core/pic8259.c
index cc2071fc0..5c00deede 100644
--- a/src/arch/i386/core/pic8259.c
+++ b/src/arch/i386/core/pic8259.c
@@ -8,12 +8,6 @@
#include "pic8259.h"
#include "realmode.h"
-#ifdef DEBUG_IRQ
-#define DBG(...) printf ( __VA_ARGS__ )
-#else
-#define DBG(...)
-#endif
-
/* State of trivial IRQ handler */
irq_t trivial_irq_installed_on = IRQ_NONE;
static uint16_t trivial_irq_previous_trigger_count = 0;
diff --git a/src/arch/i386/core/relocate.c b/src/arch/i386/core/relocate.c
index 3a2702a1f..834bc7886 100644
--- a/src/arch/i386/core/relocate.c
+++ b/src/arch/i386/core/relocate.c
@@ -42,13 +42,6 @@ extern char _end[];
extern struct post_reloc_fn post_reloc_fns[];
extern struct post_reloc_fn post_reloc_fns_end[];
-#undef DBG
-#ifdef DEBUG_RELOCATE
-#define DBG(...) printf ( __VA_ARGS__ )
-#else
-#define DBG(...)
-#endif
-
static void relocate ( void ) {
unsigned long addr, eaddr, size;
unsigned i;
diff --git a/src/arch/i386/drivers/net/undi.c b/src/arch/i386/drivers/net/undi.c
index 0bc0d23cf..a8d1741aa 100644
--- a/src/arch/i386/drivers/net/undi.c
+++ b/src/arch/i386/drivers/net/undi.c
@@ -207,6 +207,7 @@ static void shoot_targets ( firing_squad_lineup_t *lineup ) {
/* Debug macros
*/
+#undef DBG
#ifdef TRACE_UNDI
#define DBG(...) printf ( __VA_ARGS__ )
#else
diff --git a/src/arch/i386/firmware/pcbios/basemem.c b/src/arch/i386/firmware/pcbios/basemem.c
index 07b5cc812..1d900b788 100644
--- a/src/arch/i386/firmware/pcbios/basemem.c
+++ b/src/arch/i386/firmware/pcbios/basemem.c
@@ -25,13 +25,6 @@
/* Local prototypes */
static void free_unused_base_memory ( void );
-#undef DBG
-#ifdef DEBUG_BASEMEM
-#define DBG(...) printf ( __VA_ARGS__ )
-#else
-#define DBG(...)
-#endif
-
/*
* Return amount of free base memory in bytes
*