branched to enable main branch to return to the old MMU handling code since the new style couldn't be made to work (for now).

2014-06-20 16:06:08 +00:00
119 changed files with 4409 additions and 14160 deletions
--- a/.gdbinit
+++ b/.gdbinit
@@ -1,8 +1,7 @@
 #set disassemble-next-line on
 define tr
-	#!killall m68k-bdm-gdbserver
+	!killall m68k-bdm-gdbserver
 	target remote | m68k-bdm-gdbserver pipe /dev/bdmcf3
-	#target remote localhost:1234
 	#target remote | m68k-bdm-gdbserver pipe /dev/tblcf3
 	#target dbug /dev/ttyS0
 	#monitor bdm-reset
--- a/BaS_gcc.files
+++ b/BaS_gcc.files
@@ -229,43 +229,3 @@ COPYING.LESSER
 dump.bdm
 mcf5474.gdb
 Makefile
-tos/jtagwait/Makefile
-tos/jtagwait/sources/jtagwait.c
-tos/jtagwait/include/driver_vec.h
-tos/bascook/Makefile
-tos/mcdcook/sources/bascook.c
-tos/jtagwait/include/bas_printf.h
-tos/jtagwait/include/bas_string.h
-tos/jtagwait/include/MCF5475_CLOCK.h
-tos/jtagwait/include/MCF5475_CTM.h
-tos/jtagwait/include/MCF5475_DMA.h
-tos/jtagwait/include/MCF5475_DSPI.h
-tos/jtagwait/include/MCF5475_EPORT.h
-tos/jtagwait/include/MCF5475_FBCS.h
-tos/jtagwait/include/MCF5475_FEC.h
-tos/jtagwait/include/MCF5475_GPIO.h
-tos/jtagwait/include/MCF5475_GPT.h
-tos/jtagwait/include/MCF5475_I2C.h
-tos/jtagwait/include/MCF5475_INTC.h
-tos/jtagwait/include/MCF5475_MMU.h
-tos/jtagwait/include/MCF5475_PAD.h
-tos/jtagwait/include/MCF5475_PCI.h
-tos/jtagwait/include/MCF5475_PCIARB.h
-tos/jtagwait/include/MCF5475_PSC.h
-tos/jtagwait/include/MCF5475_SDRAMC.h
-tos/jtagwait/include/MCF5475_SEC.h
-tos/jtagwait/include/MCF5475_SIU.h
-tos/jtagwait/include/MCF5475_SLT.h
-tos/jtagwait/include/MCF5475_SRAM.h
-tos/jtagwait/include/MCF5475_USB.h
-tos/jtagwait/include/MCF5475_XLB.h
-tos/jtagwait/include/MCF5475.h
-tos/jtagwait/include/driver_vec.h
-tos/jtagwait/sources/bas_printf.c
-tos/jtagwait/sources/bas_string.c
-tos/jtagwait/sources/printf_helper.S
-tos/bascook/Makefile
-tos/bascook/sources/bascook.c
-tos/Makefile
-usb/usb_hub.c
-include/usb_hub.h
--- a/1689
+++ b/1689
--- a/14
+++ b/14
@@ -95,7 +95,6 @@ CSRCS= \
 	usb.c \
 	ohci-hcd.c \
 	ehci-hcd.c \
-	usb_hub.c \
 	usb_mouse.c \
 	ikbd.c \
 	\
@@ -125,7 +124,6 @@ CSRCS= \
 	radeon_accel.c \
 	radeon_cursor.c \
 	radeon_monitor.c \
-	fnt_st_8x16.c \
 	\
 	x86decode.c \
 	x86sys.c \
@@ -143,9 +141,9 @@ CSRCS= \

 ASRCS= \
 	startcf.S \
+	printf_helper.S \
 	exceptions.S \
-	xhdi_vec.S \
-	pci_wrappers.S
+	xhdi_vec.S

 SRCS=$(ASRCS) $(CSRCS)
 COBJS=$(patsubst %.c,%.o,$(CSRCS))
@@ -156,18 +154,12 @@ LIBBAS=libbas.a

 LIBS=$(patsubst %,%/$(LIBBAS),$(TRGTDIRS))

-all: ver fls ram bfl lib tos
+all: fls ram bfl lib
 fls: $(patsubst %,%/$(FLASH_EXEC),$(TRGTDIRS))
 ram: $(patsubst %,%/$(RAM_EXEC),$(TRGTDIRS))
 bfl: $(patsubst %,%/$(BASFLASH_EXEC),$(TRGTDIRS))
 lib: $(LIBS)

-.PHONY: ver
-ver:
-	touch include/version.h
-.PHONY: tos
-tos:
-	(cd tos; make)

 .PHONY: clean
 clean:
--- a/bas.lk.in
+++ b/bas.lk.in
@@ -48,10 +48,8 @@ SECTIONS
 		
 		OBJDIR/BaS.o(.text)
 		OBJDIR/pci.o(.text)
-		OBJDIR/pci_wrappers.o(.text)
 		OBJDIR/usb.o(.text)
 		OBJDIR/driver_mem.o(.text)
-		OBJDIR/usb_hub.o(.text)
 		OBJDIR/usb_mouse.o(.text)
 		OBJDIR/ohci-hcd.o(.text)
 		OBJDIR/ehci-hcd.o(.text)
@@ -78,6 +76,7 @@ SECTIONS
 		OBJDIR/s19reader.o(.text)
 		OBJDIR/bas_printf.o(.text)
 		OBJDIR/bas_string.o(.text)
+		OBJDIR/printf_helper.o(.text)
 		OBJDIR/cache.o(.text)
 		OBJDIR/dma.o(.text)
 		OBJDIR/MCD_dmaApi.o(.text)
@@ -204,8 +203,8 @@ SECTIONS
 	__EMUTOS_SIZE           = 0x00100000;

 	/* where FPGA data lives in flash */
-	__FPGA_CONFIG 		= 0xe0700000;
-	__FPGA_CONFIG_SIZE 	= 0x100000;
+	__FPGA_FLASH_DATA 		= 0xe0700000;
+	__FPGA_FLASH_DATA_SIZE 	= 0x100000;

 	/* VIDEO RAM BASIS */
 	__VRAM                  = 0x60000000;
@@ -229,14 +228,8 @@ SECTIONS
 	/* 4KB on-chip Core SRAM1 */
 	__RAMBAR1               = 0xFF101000;
 	__RAMBAR1_SIZE          = 0x00001000;
-	__SUP_SP                = __RAMBAR1 + __RAMBAR1_SIZE - 4;
+ 	__SUP_SP                = __RAMBAR0 + __RAMBAR0_SIZE - 4;

-	/*
-	 * this flag (if 1) indicates that FPGA configuration has been loaded through JTAG
-	 * and shouldn't be overwritten on boot
-	 */
-	__FPGA_JTAG_LOADED		= __RAMBAR1;
-	__FPGA_JTAG_VALID		= __RAMBAR1 + 4;
 	/* system variables */
 	
 	/* RAMBAR0 0 to 0x7FF -> exception vectors */
--- a/dma/MCD_dmaApi.c
+++ b/dma/MCD_dmaApi.c
@@ -352,7 +352,7 @@ int MCD_dmaStatus(int channel)
 * Returns:     MCD_CHANNEL_INVALID if channel is invalid, else MCD_OK
 */

-int MCD_startDma(int channel, /* the channel on which to run the DMA */
+int __attribute__((flatten)) MCD_startDma(int channel, /* the channel on which to run the DMA */
 		int8_t *srcAddr, /* the address to move data from, or physical buffer-descriptor address */
 		int16_t srcIncr, /* the amount to increment the source address per transfer */
 		int8_t *destAddr, /* the address to move data to */
--- a/dma/dma.c
+++ b/dma/dma.c
@@ -41,7 +41,7 @@

 #define DBG_DMA
 #ifdef DBG_DMA
-#define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
+#define dbg(format, arg...) do { xprintf("DEBUG: " format, ##arg); } while (0)
 #else
 #define dbg(format, arg...) do { ; } while (0)
 #endif /* DBG_DMA */
@@ -75,6 +75,7 @@ static struct dma_channel dma_channel[NCHANNELS] =
 	{-1, NULL}, {-1, NULL}, {-1, NULL}, {-1, NULL},
 };

+/********************************************************************/
 /*
 * Enable all DMA interrupts
 *
@@ -88,7 +89,7 @@ void dma_irq_enable(uint8_t lvl, uint8_t pri)
 	MCF_INTC_ICR48 = 0
 		| MCF_INTC_ICR_IP(pri)
 		| MCF_INTC_ICR_IL(lvl);
-	dbg("DMA irq assigned level %d, priority %d\r\n", lvl, pri);
+	dbg("%s:DMA irq assigned level %d, priority %d\r\n", __FUNCTION__, lvl, pri);

 	/* Unmask all task interrupts */
 	MCF_DMA_DIMR = 0;
@@ -99,9 +100,11 @@ void dma_irq_enable(uint8_t lvl, uint8_t pri)
 	/* Unmask the DMA interrupt in the interrupt controller */
 	MCF_INTC_IMRH &= ~MCF_INTC_IMRH_INT_MASK48;

-	dbg("DMA task interrupts unmasked, pending interrupts cleared, interrupt controller active\r\n");
+	dbg("%s: DMA task interrupts unmasked, pending interrupts cleared, interrupt controller active\r\n",
+		__FUNCTION__);
 }

+/********************************************************************/
 /*
 * Disable all DMA interrupts
 */
@@ -116,7 +119,7 @@ void dma_irq_disable(void)
 	/* Mask the DMA interrupt in the interrupt controller */
 	MCF_INTC_IMRH |= MCF_INTC_IMRH_INT_MASK48;

-	dbg("DMA interrupts masked and disabled\r\n");
+	dbg("%s: DMA interrupts masked and disabled\r\n", __FUNCTION__);
 }

 int dma_set_initiator(int initiator)
@@ -174,7 +177,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot found\r\n");
+				dbg("%s: no free slot found\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -193,7 +196,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -207,7 +210,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -221,7 +224,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);
 				
 				return 1;
 			}
@@ -235,7 +238,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -249,7 +252,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -263,7 +266,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -277,7 +280,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -291,7 +294,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -305,7 +308,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -319,7 +322,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -333,7 +336,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -356,7 +359,7 @@ int dma_set_initiator(int initiator)
 				used_reqs[28] = DMA_PSC2_RX;            }
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -370,7 +373,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -384,7 +387,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -398,7 +401,7 @@ int dma_set_initiator(int initiator)
 			}
 			else /* No empty slots */
 			{
-				dbg("no free slot\r\n");
+				dbg("%s: no free slot\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -406,7 +409,7 @@ int dma_set_initiator(int initiator)

 		default:
 			{
-				dbg("don't know what to do\r\n");
+				dbg("%s: don't know what to do\r\n", __FUNCTION__);

 				return 1;
 			}
@@ -433,7 +436,7 @@ uint32_t dma_get_initiator(int requestor)
 		if (used_reqs[i] == requestor)
 			return i;
 	}
-	dbg("no initiator found for requestor %d\r\n", requestor);
+	dbg("%s: no initiator found for requestor %d\r\n", __FUNCTION__, requestor);

 	return 0;
 }
@@ -456,7 +459,7 @@ void dma_free_initiator(int requestor)
 			break;
 		}
 	}
-	dbg("DMA requestor %d freed\r\n", requestor);
+	dbg("%s: DMA requestor %d freed\r\n", __FUNCTION__, requestor);
 }

 /*
@@ -473,7 +476,7 @@ int dma_set_channel(int requestor, void (*handler)(void))
 	int i;

 	/* Check to see if this requestor is already assigned to a channel */
-	dbg("check if requestor %d is already assigned to a channel\r\n", requestor);
+	dbg("%s: check if requestor %d is already assigned to a channel\r\n", __FUNCTION__, requestor);
 	if ((i = dma_get_channel(requestor)) != -1)
 		return i;

@@ -483,11 +486,11 @@ int dma_set_channel(int requestor, void (*handler)(void))
 		{
 			dma_channel[i].req = requestor;
 			dma_channel[i].handler = handler;
-			dbg("assigned channel %d to requestor %d\r\n", i, requestor);
+			dbg("%s: assigned channel %d to requestor %d\r\n", __FUNCTION__, i, requestor);
 			return i;
 		}
 	}
-	dbg("no free DMA channel found for requestor %d\r\n", requestor);
+	dbg("%s: no free DMA channel found for requestor %d\r\n", __FUNCTION__, requestor);

 	/* All channels taken */
 	return -1;
@@ -499,7 +502,7 @@ void dma_clear_channel(int channel)
 	{
 		dma_channel[channel].req = -1;
 		dma_channel[channel].handler = NULL;
-		dbg("cleared DMA channel %d\r\n", channel);
+		dbg("%s: cleared DMA channel %d\r\n", __FUNCTION__, channel);
 	}
 }

@@ -522,7 +525,7 @@ int dma_get_channel(int requestor)
 		if (dma_channel[i].req == requestor)
 			return i;
 	}
-	dbg("no channel occupied by requestor %d\r\n", requestor);
+	dbg("%s: no channel occupied by requestor %d\r\n", __FUNCTION__, requestor);
 	return -1;
 }

@@ -554,9 +557,8 @@ void dma_free_channel(int requestor)
 int dma_interrupt_handler(void *arg1, void *arg2)
 {
 	int i, interrupts;
-	uint32_t ipl;

-	ipl = set_ipl(7);		/* do not disturb */
+	(void) set_ipl(7);

 	/* 
 	 * Determine which interrupt(s) triggered by AND'ing the 
@@ -567,7 +569,7 @@ int dma_interrupt_handler(void *arg1, void *arg2)
 	/* Make sure we are here for a reason */
 	if (interrupts == 0)
 	{
-		dbg("not DMA interrupt! Spurious?\r\n");
+		dbg("%s: not DMA interrupt! Spurious?\r\n", __FUNCTION__);
 		return 0;
 	}

@@ -581,14 +583,12 @@ int dma_interrupt_handler(void *arg1, void *arg2)
 			/* If there is a handler, call it */
 			if (dma_channel[i].handler != NULL)
 			{
-				dbg("call handler for DMA channel %d (%p)\r\n", i, dma_channel[i].handler);
+				dbg("%s: call handler for DMA channel %d (%p)\r\n", __FUNCTION__, i, dma_channel[i].handler);
 				dma_channel[i].handler();
 			}
 		}
 	}

-	set_ipl(ipl);
-
 	return 1;	/* handled */
 }
 /********************************************************************/
@@ -608,7 +608,7 @@ void *dma_memcpy(void *dst, void *src, size_t n)
 	ret = MCD_startDma(1, src, 4, dst, 4, n, 4, DMA_ALWAYS, 0, MCD_SINGLE_DMA, 0);
 	if (ret == MCD_OK)
 	{
-		dbg("DMA on channel 1 successfully started\r\n");
+		dbg("%s: DMA on channel 1 successfully started\r\n", __FUNCTION__);
 	}

 	do
@@ -652,7 +652,7 @@ void *dma_memcpy(void *dst, void *src, size_t n)
 	end = MCF_SLT0_SCNT;
 	time = (start - end) / (SYSCLK / 1000) / 1000;
 #endif /* DBG_DMA */
-	dbg("took %d ms (%f Mbytes/second)\r\n", time, n / (float) time / 1000.0);
+	dbg("%s: took %d ms (%f Mbytes/second)\r\n", __FUNCTION__, time, n / (float) time / 1000.0);

 	return dst;
 }
@@ -661,11 +661,11 @@ int dma_init(void)
 {
 	int res;

-	dbg("MCD DMA API initialization: ");
+	dbg("%s: MCD DMA API initialization: ", __FUNCTION__);
 	res = MCD_initDma((dmaRegs *) &_MBAR[0x8000], SYS_SRAM, MCD_RELOC_TASKS | MCD_COMM_PREFETCH_EN);
 	if (res != MCD_OK)
 	{
-		dbg("DMA API initialization failed (0x%x)\r\n", res);
+		dbg("%s: DMA API initialization failed (0x%x)\r\n", __FUNCTION__, res);
 		return 0;
 	}

--- a/exe/basflash.c
+++ b/exe/basflash.c
@@ -21,9 +21,10 @@
 *      Author: Markus Fröschle
 */

-#include <bas_types.h>
-#include "bas_printf.h"
+#include <stdint.h>
+#include <stdbool.h>
 #include "bas_string.h"
+#include "bas_printf.h"
 #include "diskio.h"
 #include "ff.h"
 #include "s19reader.h"
--- a/exe/basflash_start.c
+++ b/exe/basflash_start.c
@@ -21,7 +21,7 @@
 *      Author: Markus Fröschle
 */

-#include <bas_types.h>
+#include <stdint.h>

 static uint32_t ownstack[4096];
 static uint32_t *stackptr = &ownstack[4095];
--- a/flash/flash.c
+++ b/flash/flash.c
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <stddef.h>
 #include "bas_types.h"

--- a/flash/s19reader.c
+++ b/flash/s19reader.c
@@ -23,7 +23,8 @@
 * Copyright 2012        M. Froeschle
 */

-#include <bas_types.h>
+#include <stdint.h>
+#include <stdbool.h>

 #include "bas_printf.h"
 #include "bas_string.h"
--- a/flash_scripts/flash_firebee_bas.bdm
+++ b/flash_scripts/flash_firebee_bas.bdm
@@ -1,53 +1,71 @@
-#!/usr/local/bin/bdmctrl -D2
+#!/usr/local/bin/bdmctrl 
 #
 # firebee board initialization for bdmctrl 
 #
 open $1
 reset
-sleep 1
+sleep 10

 wait

+# Turn on MBAR at 0xFF00_0000
+write-ctrl 0x0C0F 0xFF000000
+
+# set VBR
+write-ctrl 0x0801 0x00000000
+
+#
+# Init CS0 (BootFLASH @ E000_0000 - E07F_FFFF 8Mbytes)
+write 0xFF000500 0xE0000000 4
+write 0xFF000508 0x00001180 4
+write 0xFF000504 0x007F0001 4
+
+# SDRAM Initialization @ 0000_0000 - 1FFF_FFFF 512Mbytes
+write 0xFF000004 0x000002AA 4 # SDRAMDS configuration
+write 0xFF000020 0x0000001A 4 # SDRAM CS0 configuration (128Mbytes 0000_0000 - 07FF_FFFF)
+write 0xFF000024 0x0800001A 4 # SDRAM CS1 configuration (128Mbytes 0800_0000 - 0FFF_FFFF)
+write 0xFF000028 0x1000001A 4 # SDRAM CS2 configuration (128Mbytes 1000_0000 - 17FF_FFFF)
+write 0xFF00002C 0x1800001A 4 # SDRAM CS3 configuration (128Mbytes 1800_0000 - 1FFF_FFFF)
+write 0xFF000108 0x73622830 4 # SDCFG1
+write 0xFF00010C 0x46770000 4 # SDCFG2
+
+write 0xFF000104 0xE10D0002 4 # SDCR + IPALL
+write 0xFF000100 0x40010000 4 # SDMR (write to LEMR)
+write 0xFF000100 0x048D0000 4 # SDMR (write to LMR)
+sleep 100
+write 0xFF000104 0xE10D0002 4 # SDCR + IPALL
+write 0xFF000104 0xE10D0004 4 # SDCR + IREF (first refresh)
+write 0xFF000104 0xE10D0004 4 # SDCR + IREF (first refresh)
+write 0xFF000100 0x008D0000 4 # SDMR (write to LMR)
+write 0xFF000104 0x710D0F00 4 # SDCR (lock SDMR and enable refresh)
+sleep 10
+
+
 # use system sdram as flashlib scratch area.
 # TODO: plugin flashing seems to work o.k. now for smaller binaries, while it doesn't for larger ones (EmuTOS) yet.
 # This seems to be related to large flash buffers and PC-relative adressing of the plugin
-#flash-plugin 0x1000 0xf000 flash29-5475.plugin
+flash-plugin 0x1000 0xf000 flash29.plugin
 # notify flashlib that we have flash at address 0xE0000000, length 0x7FFFFF, plugin is flash29
-flash 0xe0000000
+flash 0xE0000000

 # Erase flash from 0xE0000000 to 0xE00FFFFF (reserved space for BaS)
 #
 # Caution: sector offset numbers need to be the ones from the x16 address range
 # column and they vary in size - needs to be exactly as in the data sheet (p. 9)
 #
+# contrary to documentation, it seems we need to erase-wait after each sector

-erase 0xe0000000 0
-erase 0xe0000000 0x1000
-erase 0xe0000000 0x2000
-erase 0xe0000000 0x3000
-erase 0xe0000000 0x4000
-erase 0xe0000000 0x5000
-erase 0xe0000000 0x6000
-erase 0xe0000000 0x7000
-erase 0xe0000000 0x8000
-erase 0xe0000000 0x10000
-erase 0xe0000000 0x18000
-erase 0xe0000000 0x20000
-erase 0xe0000000 0x28000
-erase 0xe0000000 0x30000
-erase 0xe0000000 0x38000
-erase 0xe0000000 0x40000
-erase 0xe0000000 0x48000
-erase 0xe0000000 0x50000
-erase 0xe0000000 0x58000
-erase 0xe0000000 0x60000
-erase 0xe0000000 0x70000
-erase 0xe0000000 0x78000
-
-erase-wait 0xe0000000
-# should now have erased from 0xe0000000 to 0xe00fffff
-
-dump-mem 0xe0010000 0x20 b
+erase 0xE0000000 0
+erase 0xE0000000 1
+erase 0xE0000000 2
+erase 0xE0000000 3
+erase 0xE0000000 4
+erase 0xE0000000 5
+erase 0xE0000000 7
+erase 0xE0000000 8
+erase 0xE0000000 9
+erase 0xE0000000 10
+erase-wait 0xE0000000

 load -v ../firebee/bas.elf
 wait
--- a/fs/ccsbcs.c
+++ b/fs/ccsbcs.c
@@ -26,7 +26,7 @@
 */

 #include <ff.h>
-#include <bas_types.h>
+#include <stdint.h>

 #if _CODE_PAGE == 437
 #define _TBLDEF 1
--- a/fs/ff.c
+++ b/fs/ff.c
@@ -95,7 +95,7 @@
 /                   Changed option name _FS_SHARE to _FS_LOCK.
 /---------------------------------------------------------------------------*/

-#include <bas_types.h>
+#include <stdint.h>
 #include <ff.h>			/* FatFs configurations and declarations */
 #include <diskio.h>		/* Declarations of low level disk I/O functions */

--- a/if/driver_vec.c
+++ b/if/driver_vec.c
@@ -23,13 +23,13 @@
 *      Author: Markus Fröschle
 */

-#include <bas_types.h>
+#include <stdint.h>
+#include <stddef.h>
 #include "version.h"
 #include "xhdi_sd.h"
 #include "dma.h"
 #include "driver_vec.h"
 #include "driver_mem.h"
-#include "pci.h"

 /*
 * driver interface struct for the SD card BaS driver
@@ -55,73 +55,19 @@ static struct dma_driver_interface dma_interface =
 	.dma_get_channel = dma_get_channel,
 	.dma_free_channel = dma_free_channel,
 	.dma_clear_channel = dma_clear_channel,
-	.MCD_startDma = (int (*)(long, int8_t *, unsigned int, int8_t *, unsigned int,
-					unsigned int, unsigned int, unsigned int, int,
-					unsigned int, unsigned int)) MCD_startDma,
-	.MCD_dmaStatus = (int32_t (*)(int32_t)) MCD_dmaStatus,
-	.MCD_XferProgrQuery = (int32_t (*)(int32_t, MCD_XferProg *)) MCD_XferProgrQuery,
-	.MCD_killDma = (int32_t (*)(int32_t)) MCD_killDma,
-	.MCD_continDma = (int32_t (*)(int32_t)) MCD_continDma,
-	.MCD_pauseDma = (int32_t (*)(int32_t)) MCD_pauseDma,
-	.MCD_resumeDma = (int32_t (*)(int32_t)) MCD_resumeDma,
-	.MCD_csumQuery = (int32_t (*)(int32_t, uint32_t *)) MCD_csumQuery,
+	.MCD_startDma = MCD_startDma,
+	.MCD_dmaStatus = MCD_dmaStatus,
+	.MCD_XferProgrQuery = MCD_XferProgrQuery,
+	.MCD_killDma = MCD_killDma,
+	.MCD_continDma = MCD_continDma,
+	.MCD_pauseDma = MCD_pauseDma,
+	.MCD_resumeDma = MCD_resumeDma,
+	.MCD_csumQuery = MCD_csumQuery,
 	.dma_malloc = driver_mem_alloc,
 	.dma_free = driver_mem_free
 };

-extern struct fb_info *info_fb;
-
-/*
- * driver interface struct for the PCI_BIOS BaS driver
- */
-static struct pci_bios_interface pci_interface =
-{
-	.subjar = 0,
-	.version = 0x00010000,
-	.find_pci_device = wrapper_find_pci_device,
-	.find_pci_classcode = wrapper_find_pci_classcode,
-	.read_config_byte = wrapper_read_config_byte,
-	.read_config_word = wrapper_read_config_word,
-	.read_config_longword = wrapper_read_config_longword,
-	.fast_read_config_byte = wrapper_fast_read_config_byte,
-	.fast_read_config_word = wrapper_fast_read_config_word,
-	.fast_read_config_longword = wrapper_fast_read_config_longword,
-	.write_config_byte = wrapper_write_config_byte,
-	.write_config_word = wrapper_write_config_word,
-	.write_config_longword = wrapper_write_config_longword,
-	.hook_interrupt = wrapper_hook_interrupt,
-	.unhook_interrupt = wrapper_unhook_interrupt,
-	.special_cycle = wrapper_special_cycle,
-	.get_routing = wrapper_get_routing,
-	.set_interrupt = wrapper_set_interrupt,
-	.get_resource = wrapper_get_resource,
-	.get_card_used = wrapper_get_card_used,
-	.set_card_used = wrapper_set_card_used,
-	.read_mem_byte = wrapper_read_mem_byte,
-	.read_mem_word = wrapper_read_mem_word,
-	.read_mem_longword = wrapper_read_mem_longword,
-	.fast_read_mem_byte = wrapper_fast_read_mem_byte,
-	.fast_read_mem_word = wrapper_fast_read_mem_word,
-	.fast_read_mem_longword = wrapper_fast_read_mem_longword,
-	.write_mem_byte = wrapper_write_mem_byte,
-	.write_mem_word = wrapper_write_mem_word,
-	.write_mem_longword = wrapper_write_mem_longword,
-	.read_io_byte = wrapper_read_io_byte,
-	.read_io_word = wrapper_read_io_word,
-	.read_io_longword = wrapper_read_io_longword,
-	.fast_read_io_byte = wrapper_fast_read_io_byte,
-	.fast_read_io_word = wrapper_fast_read_io_word,
-	.fast_read_io_longword = wrapper_fast_read_io_longword,
-	.write_io_byte = wrapper_write_io_byte,
-	.write_io_word = wrapper_write_io_word,
-	.write_io_longword = wrapper_write_io_longword,
-	.get_machine_id = wrapper_get_machine_id,
-	.get_pagesize = wrapper_get_pagesize,
-	.virt_to_bus = wrapper_virt_to_bus,
-	.bus_to_virt = wrapper_bus_to_virt,
-	.virt_to_phys = wrapper_virt_to_phys,
-	.phys_to_virt = wrapper_phys_to_virt,
-};
+extern const struct fb_info *info_fb;

 /*
 * driver interface struct for the BaS framebuffer video driver
@@ -159,14 +105,7 @@ static struct generic_interface interfaces[] =
 		.revision = 1,
 		.interface.fb = &framebuffer_interface,
 	},
-	{
-		.type = PCI_DRIVER,
-		.name = "PCI",
-		.description = "BaS PCI_BIOS driver",
-		.version = 0,
-		.revision = 1,
-		.interface.pci = &pci_interface,
-	},
+
 	/* insert new drivers here */

 	{
@@ -182,7 +121,7 @@ static struct driver_table bas_drivers =
 	.bas_version = MAJOR_VERSION,
 	.bas_revision = MINOR_VERSION,
 	.remove_handler = NULL,
-	.interfaces = interfaces
+	.interfaces = { interfaces }
 };

 void __attribute__((interrupt)) get_bas_drivers(void)
--- a/include/MCF5475.h
+++ b/include/MCF5475.h
@@ -16,7 +16,7 @@
 #ifndef __MCF5475_H__
 #define __MCF5475_H__

-#include <bas_types.h>
+#include <stdint.h>
 /***
 * MCF5475 Derivative Memory map definitions from linker command files:
 * __MBAR, __MMUBAR, __RAMBAR0, __RAMBAR0_SIZE, __RAMBAR1, __RAMBAR1_SIZE
--- a/include/bas_types.h
+++ b/include/bas_types.h
@@ -30,6 +30,5 @@

 #include <stdint.h>
 #include <stdbool.h>
-#include <stddef.h>		/* for sizeof() etc. */

 #endif /* BAS_TYPES_H_ */
--- a/include/cache.h
+++ b/include/cache.h
@@ -25,7 +25,8 @@
 *
 */

-#include <bas_types.h>
+#include <stdint.h>
+#include <stddef.h>

 /*
 * CACR Cache Control Register
@@ -53,7 +54,11 @@
 #define CF_CACR_ICINVA      (0x00000100) /* Instr Cache Invalidate All       */
 #define CF_CACR_IDSP        (0x00000080) /* Ins default supervisor-protect   */
 #define CF_CACR_EUSP        (0x00000020) /* Switch stacks in user mode       */
-#define CF_CACR_DF          (0x00000010) /* Disable FPU                      */
+
+#define _DCACHE_SET_MASK ((DCACHE_SIZE/64-1)<<CACHE_WAYS)
+#define _ICACHE_SET_MASK ((ICACHE_SIZE/64-1)<<CACHE_WAYS)
+#define LAST_DCACHE_ADDR _DCACHE_SET_MASK
+#define LAST_ICACHE_ADDR _ICACHE_SET_MASK

 #define ICACHE_SIZE 0x8000              /* instruction - 32k */
 #define DCACHE_SIZE 0x8000              /* data - 32k */
@@ -62,10 +67,6 @@
 #define CACHE_SETS 0x0200               /* 512 sets */
 #define CACHE_WAYS 0x0004               /* 4 way */

-#define _DCACHE_SET_MASK ((DCACHE_SIZE / 64 - 1) << CACHE_WAYS)
-#define _ICACHE_SET_MASK ((ICACHE_SIZE / 64 - 1) << CACHE_WAYS)
-#define LAST_DCACHE_ADDR _DCACHE_SET_MASK
-#define LAST_ICACHE_ADDR _ICACHE_SET_MASK

 #define CACHE_DISABLE_MODE      (CF_CACR_DCINVA+        \
 									CF_CACR_BCINVA+        \
@@ -82,7 +83,7 @@ extern uint32_t cacr_get(void);
 extern void cacr_set(uint32_t);
 extern void flush_icache_range(void *address, size_t size);
 extern void flush_dcache_range(void *address, size_t size);
-extern void flush_cache_range(void *address, size_t size);
+


 #endif /* _CACHE_H_ */
--- a/include/diskio.h
+++ b/include/diskio.h
@@ -12,7 +12,7 @@ extern "C" {
 #define _USE_WRITE	1	/* 1: Enable disk_write function */
 #define _USE_IOCTL	1	/* 1: Enable disk_ioctl fucntion */

-#include <bas_types.h>
+#include <stdint.h>


 /* Status of Disk Functions */
--- a/include/dma.h
+++ b/include/dma.h
@@ -26,8 +26,8 @@
 #include "MCD_dma.h"
 #include "bas_string.h"

-#define DMA_INTC_LVL        5
-#define DMA_INTC_PRI        3
+#define DMA_INTC_LVL        6
+#define DMA_INTC_PRI        0


 void *dma_memcpy(void *dst, void *src, size_t n);
--- a/include/driver_vec.h
+++ b/include/driver_vec.h
@@ -27,17 +27,15 @@

 #include "xhdi_sd.h"
 #include "MCD_dma.h"
-#include "pci.h"

 enum driver_type
 {
+	END_OF_DRIVERS,		/* marks end of driver list */
 	BLOCKDEV_DRIVER,
 	CHARDEV_DRIVER,
+	VIDEO_DRIVER,
 	XHDI_DRIVER,
 	MCD_DRIVER,
-	VIDEO_DRIVER,
-	PCI_DRIVER,
-	END_OF_DRIVERS,		/* marks end of driver list */
 };

 struct generic_driver_interface
@@ -206,66 +204,12 @@ struct framebuffer_driver_interface
 	struct fb_info **framebuffer_info;	/* pointer to an fb_info struct (defined in include/fb.h) */
 };

-struct pci_bios_interface {
-	uint32_t subjar;
-	uint32_t version;
-	/* Although we declare this functions as standard gcc functions (cdecl),
-	 * they expect paramenters inside registers (fastcall) unsupported by gcc m68k.
-	 * Caller will take care of parameters passing convention.
-	 */
-	int32_t (*find_pci_device)	(uint32_t id, uint16_t index);
-	int32_t (*find_pci_classcode)	(uint32_t class, uint16_t index);
-	int32_t (*read_config_byte)	(int32_t handle, uint16_t reg, uint8_t *address);
-	int32_t (*read_config_word)	(int32_t handle, uint16_t reg, uint16_t *address);
-	int32_t (*read_config_longword)	(int32_t handle, uint16_t reg, uint32_t *address);
-	uint8_t (*fast_read_config_byte)	(int32_t handle, uint16_t reg);
-	uint16_t (*fast_read_config_word)	(int32_t handle, uint16_t reg);
-	uint32_t (*fast_read_config_longword)	(int32_t handle, uint16_t reg);
-	int32_t (*write_config_byte)	(int32_t handle, uint16_t reg, uint16_t val);
-	int32_t (*write_config_word)	(int32_t handle, uint16_t reg, uint16_t val);
-	int32_t (*write_config_longword)	(int32_t handle, uint16_t reg, uint32_t val);
-	int32_t (*hook_interrupt)	(int32_t handle, uint32_t *routine, uint32_t *parameter);
-	int32_t (*unhook_interrupt)	(int32_t handle);
-	int32_t (*special_cycle)	(uint16_t bus, uint32_t data);
-	int32_t (*get_routing)	(int32_t handle);
-	int32_t (*set_interrupt)	(int32_t handle);
-	int32_t (*get_resource)	(int32_t handle);
-	int32_t (*get_card_used)	(int32_t handle, uint32_t *address);
-	int32_t (*set_card_used)	(int32_t handle, uint32_t *callback);
-	int32_t (*read_mem_byte)	(int32_t handle, uint32_t offset, uint8_t *address);
-	int32_t (*read_mem_word)	(int32_t handle, uint32_t offset, uint16_t *address);
-	int32_t (*read_mem_longword)	(int32_t handle, uint32_t offset, uint32_t *address);
-	uint8_t (*fast_read_mem_byte)	(int32_t handle, uint32_t offset);
-	uint16_t (*fast_read_mem_word)	(int32_t handle, uint32_t offset);
-	uint32_t (*fast_read_mem_longword)	(int32_t handle, uint32_t offset);
-	int32_t (*write_mem_byte)	(int32_t handle, uint32_t offset, uint16_t val);
-	int32_t (*write_mem_word)	(int32_t handle, uint32_t offset, uint16_t val);
-	int32_t (*write_mem_longword)	(int32_t handle, uint32_t offset, uint32_t val);
-	int32_t (*read_io_byte)	(int32_t handle, uint32_t offset, uint8_t *address);
-	int32_t (*read_io_word)	(int32_t handle, uint32_t offset, uint16_t *address);
-	int32_t (*read_io_longword)	(int32_t handle, uint32_t offset, uint32_t *address);
-	uint8_t (*fast_read_io_byte)	(int32_t handle, uint32_t offset);
-	uint16_t (*fast_read_io_word)	(int32_t handle, uint32_t offset);
-	uint32_t (*fast_read_io_longword)	(int32_t handle, uint32_t offset);
-	int32_t (*write_io_byte)	(int32_t handle, uint32_t offset, uint16_t val);
-	int32_t (*write_io_word)	(int32_t handle, uint32_t offset, uint16_t val);
-	int32_t (*write_io_longword)	(int32_t handle, uint32_t offset, uint32_t val);
-	int32_t (*get_machine_id)	(void);
-	int32_t (*get_pagesize)	(void);
-	int32_t (*virt_to_bus)	(int32_t handle, uint32_t address, PCI_CONV_ADR *pointer);
-	int32_t (*bus_to_virt)	(int32_t handle, uint32_t address, PCI_CONV_ADR *pointer);
-	int32_t (*virt_to_phys)	(uint32_t address, PCI_CONV_ADR *pointer);
-	int32_t (*phys_to_virt)	(uint32_t address, PCI_CONV_ADR *pointer);
-//	int32_t reserved[2];
-};
-
 union interface
 {
 	struct generic_driver_interface *gdi;
 	struct xhdi_driver_interface *xhdi;
 	struct dma_driver_interface *dma;
 	struct framebuffer_driver_interface *fb;
-	struct pci_bios_interface *pci;
 };

 struct generic_interface
@@ -283,7 +227,7 @@ struct driver_table
 	uint32_t bas_version;
 	uint32_t bas_revision;
 	uint32_t (*remove_handler)();			/* calling this will disable the BaS' hook into trap #0 */
-	struct generic_interface *interfaces;
+	struct generic_interface *interfaces[];
 };


--- a/include/ehci.h
+++ b/include/ehci.h
@@ -104,8 +104,7 @@ struct ehci_hcor {
 #define USBMODE_CM_IDLE	(0 << 0)	/* idle state */

 /* Interface descriptor */
-struct usb_linux_interface_descriptor
-{
+struct usb_linux_interface_descriptor {
 	unsigned char	bLength;
 	unsigned char	bDescriptorType;
 	unsigned char	bInterfaceNumber;
@@ -118,8 +117,7 @@ struct usb_linux_interface_descriptor
 } __attribute__ ((packed));

 /* Configuration descriptor information.. */
-struct usb_linux_config_descriptor
-{
+struct usb_linux_config_descriptor {
 	unsigned char	bLength;
 	unsigned char	bDescriptorType;
 	unsigned short	wTotalLength;
@@ -131,11 +129,11 @@ struct usb_linux_config_descriptor
 } __attribute__ ((packed));

 #if defined CONFIG_EHCI_DESC_BIG_ENDIAN
-#define	ehci_readl(x)		(*((volatile uint32_t *)(x)))
-#define ehci_writel(a, b)	(*((volatile uint32_t *)(a)) = ((volatile uint32_t) b))
+#define	ehci_readl(x)		(*((volatile u32 *)(x)))
+#define ehci_writel(a, b)	(*((volatile u32 *)(a)) = ((volatile u32)b))
 #else
-#define ehci_readl(x)		swpl((*((volatile uint32_t *)(x))))
-#define ehci_writel(a, b)	(*((volatile uint32_t *)(a)) = swpl(((volatile uint32_t) b)))
+#define ehci_readl(x)		swpl((*((volatile u32 *)(x))))
+#define ehci_writel(a, b)	(*((volatile u32 *)(a)) = swpl(((volatile u32)b)))
 #endif

 #if defined CONFIG_EHCI_MMIO_BIG_ENDIAN
@@ -176,8 +174,7 @@ struct usb_linux_config_descriptor
 */

 /* Queue Element Transfer Descriptor (qTD). */
-struct qTD
-{
+struct qTD {
 	uint32_t qt_next;
 #define	QT_NEXT_TERMINATE	1
 	uint32_t qt_altnext;
@@ -186,8 +183,7 @@ struct qTD
 };

 /* Queue Head (QH). */
-struct QH
-{
+struct QH {
 	uint32_t qh_link;
 #define	QH_LINK_TERMINATE	1
 #define	QH_LINK_TYPE_ITD	0
--- a/include/exceptions.h
+++ b/include/exceptions.h
@@ -1,7 +1,7 @@
 #ifndef _EXCEPTIONS_H_
 #define _EXCEPTIONS_H_

-#include <bas_types.h>
+#include <stdint.h>

 static inline uint32_t set_ipl(uint32_t ipl)
 {
@@ -19,7 +19,7 @@ static inline uint32_t set_ipl(uint32_t ipl)
 		"		lsr.l	#8,%[ret]\r\n"			/* shift them to position */
 		: [ret] "=&d" (ret)		/* output */
 		: [ipl] "d" (ipl)		/* input */
-		: "cc", "d0"	/* clobber */
+		: "d0"	/* clobber */
 	);

 	return ret;
--- a/include/fb.h
+++ b/include/fb.h
@@ -528,6 +528,7 @@ struct fb_videomode {
 extern const struct fb_videomode vesa_modes[];

 /* timer */
+extern void udelay(long usec);
 #ifdef COLDFIRE
 #ifdef MCF5445X
 #define US_TO_TIMER(a) (a)
@@ -540,7 +541,6 @@ extern const struct fb_videomode vesa_modes[];
 #define US_TO_TIMER(a) (((a)*256)/5000)
 #define TIMER_TO_US(a) (((a)*5000)/256)
 #endif
-
 extern void start_timeout(void);
 extern int end_timeout(long msec);
 extern void mdelay(long msec);
--- a/include/ff.h
+++ b/include/ff.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif

-#include <bas_types.h>
+#include <stdint.h>
 #include <ffconf.h>		/* FatFs configuration options */

 #if _FATFS != _FFCONF
--- a/include/font.h
+++ b/include/font.h
@@ -1,98 +0,0 @@
-/*
- * font.h - font specific definitions
- *
- * Copyright (c) 2001 Lineo, Inc.
- * Copyright (c) 2004 by Authors:
- *
- * Authors:
- *  MAD     Martin Doering
- *
- * This file is distributed under the GPL, version 2 or at your
- * option any later version.  See doc/license.txt for details.
- */
-
-#ifndef FONT_H
-#define FONT_H
-
-#include <stdint.h>
-
-/* font header flags */
-
-#define F_DEFAULT 1     /* this is the default font (face and size) */
-#define F_HORZ_OFF  2   /* there are left and right offset tables */
-#define F_STDFORM  4    /* is the font in standard format */
-#define F_MONOSPACE 8   /* is the font monospaced */
-
-/* font style bits */
-
-#define F_THICKEN 1
-#define F_LIGHT 2
-#define F_SKEW  4
-#define F_UNDER 8
-#define F_OUTLINE 16
-#define F_SHADOW        32
-
-/* font specific linea variables */
-
-extern const uint16_t *v_fnt_ad;   /* address of current monospace font */
-extern const uint16_t *v_off_ad;   /* address of font offset table */
-extern uint16_t v_fnt_nd;          /* ascii code of last cell in font */
-extern uint16_t v_fnt_st;          /* ascii code of first cell in font */
-extern uint16_t v_fnt_wr;          /* font cell wrap */
-
-/* character cell specific linea variables */
-
-extern uint16_t    v_cel_ht;       /* cell height (width is 8) */
-extern uint16_t    v_cel_mx;       /* needed by MiNT: columns on the screen minus 1 */
-extern uint16_t    v_cel_my;       /* needed by MiNT: rows on the screen minus 1 */
-extern uint16_t    v_cel_wr;       /* needed by MiNT: length (in int8_ts) of a line of characters */
-
-/*
- * font_ring is a struct of four pointers, each of which points to
- * a list of font headers linked together to form a string.
- */
-
-extern struct font_head *font_ring[4];  /* Ring of available fonts */
-extern int16_t font_count;                 /* all three fonts and NULL */
-
-/* the font header descibes a font */
-
-struct font_head {
-    int16_t font_id;
-    int16_t point;
-    int8_t name[32];
-    uint16_t first_ade;
-    uint16_t last_ade;
-    uint16_t top;
-    uint16_t ascent;
-    uint16_t half;
-    uint16_t descent;
-    uint16_t bottom;
-    uint16_t max_char_width;
-    uint16_t max_cell_width;
-    uint16_t left_offset;          /* amount character slants left when skewed */
-    uint16_t right_offset;         /* amount character slants right */
-    uint16_t thicken;              /* number of pixels to smear */
-    uint16_t ul_size;              /* size of the underline */
-    uint16_t lighten;              /* mask to and with to lighten  */
-    uint16_t skew;                 /* mask for skewing */
-    uint16_t flags;
-
-    const uint8_t *hor_table;     /* horizontal offsets */
-    const uint16_t *off_table;     /* character offsets  */
-    const uint16_t *dat_table;     /* character definitions */
-    uint16_t form_width;
-    uint16_t form_height;
-
-    struct font_head *next_font;/* pointer to next font */
-    uint16_t font_seg;
-};
-
-
-
-/* prototypes */
-
-void font_init(void);           /* initialize BIOS font ring */
-void font_set_default(void);    /* choose the default font */
-
-#endif /* FONT_H */
--- a/include/interrupts.h
+++ b/include/interrupts.h
@@ -79,20 +79,20 @@
 #define	INT_SOURCE_GPT0				62	// GPT0 timer interrupt


-#define FEC0_INTC_LVL	5			/* interrupt level for FEC0 */
-#define FEC0_INTC_PRI	1			/* interrupt priority for FEC0 */
+#define FEC0_INTC_LVL	1			/* interrupt level for FEC0 */
+#define FEC0_INTC_PRI	2			/* interrupt priority for FEC0 */

-#define FEC1_INTC_LVL	5			/* interrupt level for FEC1 */
-#define FEC1_INTC_PRI	0			/* interrupt priority for FEC1 */
+#define FEC1_INTC_LVL	1			/* interrupt level for FEC1 */
+#define FEC1_INTC_PRI	2			/* interrupt priority for FEC1 */

 #define FEC_INTC_LVL(x)		((x == 0) ? FEC0_INTC_LVL : FEC1_INTC_LVL)
 #define FEC_INTC_PRI(x)		((x == 0) ? FEC0_INTC_PRI : FEC1_INTC_PRI)

 #define FEC0RX_DMA_PRI      5
-#define FEC1RX_DMA_PRI      3
+#define FEC1RX_DMA_PRI      5
 #define FECRX_DMA_PRI(x)    ((x == 0) ? FEC0RX_DMA_PRI : FEC1RX_DMA_PRI)
 #define FEC0TX_DMA_PRI      6
-#define FEC1TX_DMA_PRI      4
+#define FEC1TX_DMA_PRI      6
 #define FECTX_DMA_PRI(x)    ((x == 0) ? FEC0TX_DMA_PRI : FEC1TX_DMA_PRI)

 extern int register_interrupt_handler(uint8_t source, uint8_t level, uint8_t priority, uint8_t intr, void (*handler)(void));
@@ -104,5 +104,4 @@ extern void isr_init(void);
 extern int isr_register_handler(int vector, int (*handler)(void *, void *), void *hdev, void *harg);
 extern void isr_remove_handler(int (*handler)(void *, void *));
 extern bool isr_execute_handler(int vector);
-extern int pic_interrupt_handler(void *arg1, void *arg2);
 #endif /* _INTERRUPTS_H_ */
--- a/include/mmu.h
+++ b/include/mmu.h
@@ -24,7 +24,6 @@
 #ifndef _MMU_H_
 #define _MMU_H_

-#include <stddef.h>
 #include "bas_types.h"

 /*
@@ -51,29 +50,22 @@
 */

 #define SCA_PAGE_ID		6	/* indicates video memory page */
-#define DEFAULT_PAGE_SIZE	0x2000	/* use 8k pages for MiNT compatibility */
+
 /*
 * MMU page sizes
 */
-
-enum mmu_page_size
-{
-    MMU_PAGE_SIZE_1M	= 0,
-    MMU_PAGE_SIZE_4K	= 1,
-    MMU_PAGE_SIZE_8K	= 2,
-    MMU_PAGE_SIZE_1K	= 3
-};
+#define MMU_PAGE_SIZE_1M	0
+#define MMU_PAGE_SIZE_4K	1
+#define MMU_PAGE_SIZE_8K	2
+#define MMU_PAGE_SIZE_1K	3

 /*
 * cache modes
 */
-enum mmu_cache_modes
-{
-    CACHE_WRITETHROUGH      = 0,
-    CACHE_COPYBACK          = 1,
-    CACHE_NOCACHE_PRECISE   = 2,
-    CACHE_NOCACHE_IMPRECISE = 3
-};
+#define CACHE_WRITETHROUGH		0
+#define CACHE_COPYBACK			1
+#define CACHE_NOCACHE_PRECISE	2
+#define CACHE_NOCACHE_IMPRECISE	3


 /*
@@ -86,14 +78,22 @@ enum mmu_cache_modes
 #define	ACCESS_WRITE	(1 << 1)
 #define ACCESS_EXECUTE	(1 << 2)

+struct map_flags
+{
+	unsigned cache_mode:2;
+	unsigned protection:1;
+	unsigned page_id:8;
+	unsigned access:3;
+	unsigned unused:18;
+};
+
 /*
 * global variables from linker script
 */
 extern long video_tlb;
 extern long video_sbt;

-extern void mmu_enable(void);
 extern void mmu_init(void);
-extern int mmu_map_8k_page(uint32_t adr, uint8_t asid);
+extern void mmu_map_page(uint32_t virt, uint32_t phys, uint32_t map_size, struct map_flags flags);

 #endif /* _MMU_H_ */
--- a/include/nbuf.h
+++ b/include/nbuf.h
@@ -10,6 +10,7 @@

 #include "bas_types.h"

+/********************************************************************/
 /*
 * Include the Queue structure definitions
 */
--- a/include/net_timer.h
+++ b/include/net_timer.h
@@ -8,7 +8,9 @@
 #ifndef _TIMER_H_
 #define _TIMER_H_

-#include <bas_types.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>

 typedef struct
 {
--- a/include/ohci.h
+++ b/include/ohci.h
@@ -9,8 +9,7 @@
 
 #define USB_OHCI_MAX_ROOT_PORTS	4

-static int cc_to_error[16] =
-{
+static int cc_to_error[16] = {

 /* mapping of the OHCI CC status to error codes */
 	/* No  Error  */	       0,
@@ -31,9 +30,8 @@ static int cc_to_error[16] =
 	/* Not Access */	       -1
 };

-#ifdef DEBUG_OHCI
-static const char *cc_to_string[16] =
-{
+#ifdef DEBUG
+static const char *cc_to_string[16] = {
 	"No Error",
 	"CRC: Last data packet from endpoint contained a CRC error.",
 	"BITSTUFFING:\r\nLast data packet from endpoint contained a bit stuffing violation",
@@ -64,7 +62,7 @@ static const char *cc_to_string[16] =
 	"NOT ACCESSED:\r\nThis code is set by software before the TD is placed\r\n" \
 		     "on a list to be processed by the HC.(2)",
 };
-#endif /* DEBUG_OHCI */
+#endif /* DEBUG */

 /* ED States */

@@ -75,8 +73,7 @@ static const char *cc_to_string[16] =
 #define ED_URB_DEL	0x08

 /* usb_ohci_ed */
-struct ed
-{
+struct ed {
 	uint32_t hwINFO;
 	uint32_t hwTailP;
 	uint32_t hwHeadP;
@@ -137,8 +134,7 @@ typedef struct ed ed_t;

 #define MAXPSW 1

-struct td
-{
+struct td {
 	uint32_t hwINFO;
 	uint32_t hwCBP;		/* Current Buffer Pointer */
 	uint32_t hwNextTD;		/* Next TD Pointer */
@@ -166,8 +162,7 @@ typedef struct td td_t;
 */

 #define NUM_INTS 32	/* part of the OHCI standard */
-struct ohci_hcca
-{
+struct ohci_hcca {
 	uint32_t	int_table[NUM_INTS];	/* Interrupt ED table */
 #if defined(CONFIG_MPC5200)
 	uint16_t	pad1;			/* set to 0 on each frame_no change */
@@ -185,8 +180,7 @@ struct ohci_hcca
 * region.  This is Memory Mapped I/O.	You must use the readl() and
 * writel() macros defined in asm/io.h to access these!!
 */
-struct ohci_regs
-{
+struct ohci_regs {
 	/* control and status registers */
 	uint32_t	revision;
 	uint32_t	control;
@@ -209,8 +203,7 @@ struct ohci_regs
 	uint32_t	periodicstart;
 	uint32_t	lsthresh;
 	/* Root hub ports */
-    struct	ohci_roothub_regs
-    {
+	struct	ohci_roothub_regs {
 		uint32_t	a;
 		uint32_t	b;
 		uint32_t	status;
@@ -270,8 +263,7 @@ struct ohci_regs


 /* Virtual Root HUB */
-struct virt_root_hub
-{
+struct virt_root_hub {
 	int devnum; /* Address of Root Hub endpoint */
 	void *dev;  /* was urb */
 	void *int_addr;
@@ -391,8 +383,7 @@ typedef struct

 #define NUM_EDS 8		/* num of preallocated endpoint descriptors */

-struct ohci_device
-{
+struct ohci_device {
 	ed_t	ed[NUM_EDS];
 	int ed_cnt;
 };
@@ -404,8 +395,7 @@ struct ohci_device
 * a subset of what the full implementation needs. (Linus)
 */

-typedef struct ohci
-{
+typedef struct ohci {
 	/* ------- common part -------- */
 	long handle;              /* PCI BIOS */
 	const struct pci_device_id *ent;
@@ -453,6 +443,7 @@ static int ep_link(ohci_t * ohci, ed_t * ed);
 static int ep_unlink(ohci_t * ohci, ed_t * ed);
 static ed_t * ep_add_ed(ohci_t * ohci, struct usb_device * usb_dev, uint32_t pipe, int interval, int load);

+/*-------------------------------------------------------------------------*/

 /* we need more TDs than EDs */
 #define NUM_TD 64
--- a/include/part.h
+++ b/include/part.h
@@ -26,8 +26,7 @@
 typedef unsigned long long uint64_t;
 typedef unsigned long lbaint_t;

-typedef struct block_dev_desc
-{
+typedef struct block_dev_desc {
 	int		if_type;	/* type of the interface */
 	int		dev;		/* device number */
 	unsigned char	part_type;	/* partition type */
--- a/include/pci.h
+++ b/include/pci.h
@@ -21,7 +21,7 @@
 *      Author: Markus Fröschle
 */

-#include <bas_types.h>
+#include <stdint.h>
 #include "util.h" 	/* for swpX() */

 #define	 PCI_MEMORY_OFFSET	(0x80000000)
@@ -191,8 +191,8 @@ typedef struct                       /* structure of address conversion     */
 #define PCI_COMMAND(i)		(((i) >> 16) & 0xffff)

 /* register 0x08 macros */
-#define PCI_CLASS_CODE(i)	((swpl((i)) & 0xffff0000) >> 16)
-#define PCI_SUBCLASS(i)		((swpl((i)) & 0xffffff00) >> 8)
+#define PCI_CLASS_CODE(i)	((swpl((i)) & 0xff000000) >> 24)
+#define PCI_SUBCLASS(i)		((swpl((i)) & 0x00ff0000) >> 16)
 #define PCI_PROG_IF(i)		((swpl((i)) & 0x0000ff00) >> 8)
 #define PCI_REVISION_ID(i)	((swpl((i)) & 0x000000ff))

@@ -243,94 +243,10 @@ extern int32_t pci_write_config_longword(int32_t handle, int offset, uint32_t va
 extern int32_t pci_write_config_word(int32_t handle, int offset, uint16_t value);
 extern int32_t pci_write_config_byte(int32_t handle, int offset, uint8_t value);

+extern struct pci_rd *pci_get_resource(int32_t handle);
 extern int32_t pci_hook_interrupt(int32_t handle, void *interrupt_handler, void *parameter);
 extern int32_t pci_unhook_interrupt(int32_t handle);

-extern struct pci_rd *pci_get_resource(int32_t handle);
-
-/*
- * Not implemented PCI_BIOS functions
- */
-extern uint8_t pci_fast_read_config_byte(int32_t handle, uint16_t reg);
-extern uint16_t pci_fast_read_config_word(int32_t handle, uint16_t reg);
-extern uint32_t pci_fast_read_config_longword(int32_t handle, uint16_t reg);
-extern int32_t pci_special_cycle(uint16_t bus, uint32_t data);
-extern int32_t pci_get_routing(int32_t handle);
-extern int32_t pci_set_interrupt(int32_t handle);
-extern int32_t pci_get_card_used(int32_t handle, uint32_t *address);
-extern int32_t pci_set_card_used(int32_t handle, uint32_t *callback);
-extern int32_t pci_read_mem_byte(int32_t handle, uint32_t offset, uint8_t *address);
-extern int32_t pci_read_mem_word(int32_t handle, uint32_t offset, uint16_t *address);
-extern int32_t pci_read_mem_longword(int32_t handle, uint32_t offset, uint32_t *address);
-extern uint8_t pci_fast_read_mem_byte(int32_t handle, uint32_t offset);
-extern uint16_t pci_fast_read_mem_word(int32_t handle, uint32_t offset);
-extern uint32_t pci_fast_read_mem_longword(int32_t handle, uint32_t offset);
-extern int32_t pci_write_mem_byte(int32_t handle, uint32_t offset, uint16_t val);
-extern int32_t pci_write_mem_word(int32_t handle, uint32_t offset, uint16_t val);
-extern int32_t pci_write_mem_longword(int32_t handle, uint32_t offset, uint32_t val);
-extern int32_t pci_read_io_byte(int32_t handle, uint32_t offset, uint8_t *address);
-extern int32_t pci_read_io_word(int32_t handle, uint32_t offset, uint16_t *address);
-extern int32_t pci_read_io_longword(int32_t handle, uint32_t offset, uint32_t *address);
-extern uint8_t pci_fast_read_io_byte(int32_t handle, uint32_t offset);
-extern uint16_t pci_fast_read_io_word(int32_t handle, uint32_t offset);
-extern uint32_t pci_fast_read_io_longword(int32_t handle, uint32_t offset);
-extern int32_t pci_write_io_byte(int32_t handle, uint32_t offset, uint16_t val);
-extern int32_t pci_write_io_word(int32_t handle, uint32_t offset, uint16_t val);
-extern int32_t pci_write_io_longword(int32_t handle, uint32_t offset, uint32_t val);
-extern int32_t pci_get_machine_id(void);
-extern int32_t pci_get_pagesize(void);
-extern int32_t pci_virt_to_bus(int32_t handle, uint32_t address, PCI_CONV_ADR *pointer);
-extern int32_t pci_bus_to_virt(int32_t handle, uint32_t address, PCI_CONV_ADR *pointer);
-extern int32_t pci_virt_to_phys(uint32_t address, PCI_CONV_ADR *pointer);
-extern int32_t pci_phys_to_virt(uint32_t address, PCI_CONV_ADR *pointer);
-
-/*
- * prototypes for PCI wrapper routines
- */
-extern int32_t wrapper_find_pci_device(uint32_t id, uint16_t index);
-extern int32_t wrapper_find_pci_classcode(uint32_t class, uint16_t index);
-extern int32_t wrapper_read_config_byte(int32_t handle, uint16_t reg, uint8_t *address);
-extern int32_t wrapper_read_config_word(int32_t handle, uint16_t reg, uint16_t *address);
-extern int32_t wrapper_read_config_longword(int32_t handle, uint16_t reg, uint32_t *address);
-extern uint8_t wrapper_fast_read_config_byte(int32_t handle, uint16_t reg);
-extern uint16_t wrapper_fast_read_config_word(int32_t handle, uint16_t reg);
-extern uint32_t wrapper_fast_read_config_longword(int32_t handle, uint16_t reg);
-extern int32_t wrapper_write_config_byte(int32_t handle, uint16_t reg, uint16_t val);
-extern int32_t wrapper_write_config_word(int32_t handle, uint16_t reg, uint16_t val);
-extern int32_t wrapper_write_config_longword(int32_t handle, uint16_t reg, uint32_t val);
-extern int32_t wrapper_hook_interrupt(int32_t handle, uint32_t *routine, uint32_t *parameter);
-extern int32_t wrapper_unhook_interrupt(int32_t handle);
-extern int32_t wrapper_special_cycle(uint16_t bus, uint32_t data);
-extern int32_t wrapper_get_routing(int32_t handle);
-extern int32_t wrapper_set_interrupt(int32_t handle);
-extern int32_t wrapper_get_resource(int32_t handle);
-extern int32_t wrapper_get_card_used(int32_t handle, uint32_t *address);
-extern int32_t wrapper_set_card_used(int32_t handle, uint32_t *callback);
-extern int32_t wrapper_read_mem_byte(int32_t handle, uint32_t offset, uint8_t *address);
-extern int32_t wrapper_read_mem_word(int32_t handle, uint32_t offset, uint16_t *address);
-extern int32_t wrapper_read_mem_longword(int32_t handle, uint32_t offset, uint32_t *address);
-extern uint8_t wrapper_fast_read_mem_byte(int32_t handle, uint32_t offset);
-extern uint16_t wrapper_fast_read_mem_word(int32_t handle, uint32_t offset);
-extern uint32_t wrapper_fast_read_mem_longword(int32_t handle, uint32_t offset);
-extern int32_t wrapper_write_mem_byte(int32_t handle, uint32_t offset, uint16_t val);
-extern int32_t wrapper_write_mem_word(int32_t handle, uint32_t offset, uint16_t val);
-extern int32_t wrapper_write_mem_longword(int32_t handle, uint32_t offset, uint32_t val);
-extern int32_t wrapper_read_io_byte(int32_t handle, uint32_t offset, uint8_t *address);
-extern int32_t wrapper_read_io_word(int32_t handle, uint32_t offset, uint16_t *address);
-extern int32_t wrapper_read_io_longword(int32_t handle, uint32_t offset, uint32_t *address);
-extern uint8_t wrapper_fast_read_io_byte(int32_t handle, uint32_t offset);
-extern uint16_t wrapper_fast_read_io_word(int32_t handle, uint32_t offset);
-extern uint32_t wrapper_fast_read_io_longword(int32_t handle, uint32_t offset);
-extern int32_t wrapper_write_io_byte(int32_t handle, uint32_t offset, uint16_t val);
-extern int32_t wrapper_write_io_word(int32_t handle, uint32_t offset, uint16_t val);
-extern int32_t wrapper_write_io_longword(int32_t handle, uint32_t offset, uint32_t val);
-extern int32_t wrapper_get_machine_id(void);
-extern int32_t wrapper_get_pagesize(void);
-extern int32_t wrapper_virt_to_bus(int32_t handle, uint32_t address, PCI_CONV_ADR *pointer);
-extern int32_t wrapper_bus_to_virt(int32_t handle, uint32_t address, PCI_CONV_ADR *pointer);
-extern int32_t wrapper_virt_to_phys(uint32_t address, PCI_CONV_ADR *pointer);
-extern int32_t wrapper_phys_to_virt(uint32_t address, PCI_CONV_ADR *pointer);
-
 #define PCI_MK_CONF_ADDR(bus, device, function)	(MCF_PCI_PCICAR_E | \
 												((bus) << 16) | \
 												((device << 8) | \
--- a/include/queue.h
+++ b/include/queue.h
@@ -8,6 +8,8 @@
 #ifndef _QUEUE_H_
 #define _QUEUE_H_

+/********************************************************************/
+
 /* 
 * Individual queue node
 */
--- a/include/radeonfb.h
+++ b/include/radeonfb.h
@@ -10,9 +10,7 @@
 #include "i2c-algo-bit.h"
 #include "util.h"			/* for swpX() */
 #include "wait.h"
-
 //#include "radeon_theatre.h"
-
 #include "radeon_reg.h"

 /* Buffer are aligned on 4096 byte boundaries */
--- a/include/sd_card.h
+++ b/include/sd_card.h
@@ -31,7 +31,7 @@
 #define _SD_CARD_H_

 #include <MCF5475.h>
-#include <bas_types.h>
+#include <stdint.h>

 extern void sd_card_init(void);

--- a/include/usb.h
+++ b/include/usb.h
@@ -26,6 +26,7 @@
 #ifndef _USB_H_
 #define _USB_H_

+//#include <stdlib.h>
 #include <bas_string.h>
 #include "driver_mem.h"
 #include "pci.h"
@@ -36,6 +37,14 @@

 extern long *tab_funcs_pci;

+#define in8(addr)		Fast_read_mem_byte(usb_handle,addr)
+#define in16r(addr)		Fast_read_mem_word(usb_handle,addr)
+#define in32r(addr)		Fast_read_mem_longword(usb_handle,addr)
+#define out8(addr,val)	Write_mem_byte(usb_handle,addr,val)
+#define out16r(addr,val)	Write_mem_word(usb_handle,addr,val)
+#define out32r(addr,val)	Write_mem_longword(usb_handle,addr,val)
+
+
 #define __u8 uint8_t
 #define __u16 uint16_t
 #define __u32 uint32_t
@@ -65,19 +74,15 @@ extern int sprintD(char *s, const char *fmt, ...);

 #define USB_CNTL_TIMEOUT 100 /* 100ms timeout */

-#define USB_BUFSIZ	512
-
 /* String descriptor */
-struct usb_string_descriptor
-{
+struct usb_string_descriptor {
 	uint8_t	bLength;
 	uint8_t	bDescriptorType;
 	uint16_t	wData[1];
 } __attribute__ ((packed));

 /* device request (setup) */
-struct devrequest
-{
+struct devrequest {
 	uint8_t	requesttype;
 	uint8_t	request;
 	uint16_t	value;
@@ -86,15 +91,13 @@ struct devrequest
 } __attribute__ ((packed));

 /* All standard descriptors have these 2 fields in common */
-struct usb_descriptor_header
-{
+struct usb_descriptor_header {
 	uint8_t	bLength;
 	uint8_t	bDescriptorType;
 } __attribute__ ((packed));

 /* Device descriptor */
-struct usb_device_descriptor
-{
+struct usb_device_descriptor {
 	uint8_t	bLength;
 	uint8_t	bDescriptorType;
 	uint16_t	bcdUSB;
@@ -112,8 +115,7 @@ struct usb_device_descriptor
 } __attribute__ ((packed));

 /* Endpoint descriptor */
-struct usb_endpoint_descriptor
-{
+struct usb_endpoint_descriptor {
 	uint8_t	bLength;
 	uint8_t	bDescriptorType;
 	uint8_t	bEndpointAddress;
@@ -125,8 +127,7 @@ struct usb_endpoint_descriptor
 } __attribute__ ((packed)) __attribute__ ((aligned(2)));

 /* Interface descriptor */
-struct usb_interface_descriptor
-{
+struct usb_interface_descriptor {
 	uint8_t	bLength;
 	uint8_t	bDescriptorType;
 	uint8_t	bInterfaceNumber;
@@ -146,8 +147,7 @@ struct usb_interface_descriptor


 /* Configuration descriptor information.. */
-struct usb_config_descriptor
-{
+struct usb_config_descriptor {
 	uint8_t	bLength;
 	uint8_t	bDescriptorType;
 	uint16_t	wTotalLength;
@@ -161,8 +161,7 @@ struct usb_config_descriptor
 	struct usb_interface_descriptor if_desc[USB_MAXINTERFACES];
 } __attribute__ ((packed));

-enum
-{
+enum {
 	/* Maximum packet size; encoded as 0,1,2,3 = 8,16,32,64 */
 	PACKET_SIZE_8   = 0,
 	PACKET_SIZE_16  = 1,
@@ -170,8 +169,7 @@ enum
 	PACKET_SIZE_64  = 3,
 };

-struct usb_device
-{
+struct usb_device {
 	int	devnum;			/* Device number on USB bus */
 	int	speed;			/* full/low/high */
 	char mf[32];			/* manufacturer */
@@ -231,62 +229,67 @@ typedef struct
 * this is how the lowlevel part communicate with the outer world
 */

-extern int ohci_usb_lowlevel_init(int32_t handle, const struct pci_device_id *ent, void **priv);
-extern int ohci_usb_lowlevel_stop(void *priv);
-extern int ohci_submit_bulk_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len);
-extern int ohci_submit_control_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len, struct devrequest *setup);
-extern int ohci_submit_int_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len, int interval);
-extern void ohci_usb_enable_interrupt(int enable);
+int ohci_usb_lowlevel_init(int32_t handle, const struct pci_device_id *ent, void **priv);
+int ohci_usb_lowlevel_stop(void *priv);
+int ohci_submit_bulk_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len);
+int ohci_submit_control_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len, struct devrequest *setup);
+int ohci_submit_int_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len, int interval);
+void ohci_usb_enable_interrupt(int enable);

-extern int ehci_usb_lowlevel_init(long handle, const struct pci_device_id *ent, void **priv);
-extern int ehci_usb_lowlevel_stop(void *priv);
-extern int ehci_submit_bulk_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len);
-extern int ehci_submit_control_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len, struct devrequest *setup);
-extern int ehci_submit_int_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len, int interval);
-extern void ehci_usb_enable_interrupt(int enable);
+int ehci_usb_lowlevel_init(long handle, const struct pci_device_id *ent, void **priv);
+int ehci_usb_lowlevel_stop(void *priv);
+int ehci_submit_bulk_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len);
+int ehci_submit_control_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len, struct devrequest *setup);
+int ehci_submit_int_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len, int interval);
+void ehci_usb_enable_interrupt(int enable);

-extern void usb_enable_interrupt(int enable);
-
-extern int usb_new_device(struct usb_device *dev);
-extern struct usb_device *usb_alloc_new_device(int bus_index, void *priv);
-extern void usb_disconnect(struct usb_device **pdev);
+void usb_enable_interrupt(int enable);

 #define USB_MAX_STOR_DEV 5
+block_dev_desc_t *usb_stor_get_dev(int index);
+int usb_stor_scan(void);
+int usb_stor_info(void);
+int usb_stor_register(struct usb_device *dev);
+int usb_stor_deregister(struct usb_device *dev);

-extern block_dev_desc_t *usb_stor_get_dev(int index);
-extern int usb_stor_scan(void);
-extern int usb_stor_info(void);
-extern int usb_stor_register(struct usb_device *dev);
-extern int usb_stor_deregister(struct usb_device *dev);
+int drv_usb_kbd_init(void);
+int usb_kbd_register(struct usb_device *dev);
+int usb_kbd_deregister(struct usb_device *dev);

-extern int drv_usb_kbd_init(void);
-extern int usb_kbd_register(struct usb_device *dev);
-extern int usb_kbd_deregister(struct usb_device *dev);
+int drv_usb_mouse_init(void);
+int usb_mouse_register(struct usb_device *dev);
+int usb_mouse_deregister(struct usb_device *dev);

-extern int drv_usb_mouse_init(void);
-extern int usb_mouse_register(struct usb_device *dev);
-extern int usb_mouse_deregister(struct usb_device *dev);
+extern char usb_error_str[256];
+
+/* memory */
+void *usb_malloc(long amount);
+int usb_free(void *addr);
+int usb_mem_init(void);
+void usb_mem_stop(void);

 /* routines */
-extern int usb_init(int32_t handle, const struct pci_device_id *ent); /* initialize the USB Controller */
-extern int usb_stop(void); /* stop the USB Controller */
+USB_COOKIE *usb_get_cookie(long id);
+void usb_error_msg(const char *const fmt, ... );
+int usb_init(int32_t handle, const struct pci_device_id *ent); /* initialize the USB Controller */
+int usb_stop(void); /* stop the USB Controller */

-extern int usb_set_protocol(struct usb_device *dev, int ifnum, int protocol);
-extern int usb_set_idle(struct usb_device *dev, int ifnum, int duration, int report_id);
-extern struct usb_device *usb_get_dev_index(int index, int bus);
-extern int usb_control_msg(struct usb_device *dev, unsigned int pipe, uint8_t request, uint8_t requesttype,
-						   uint16_t value, uint16_t index, void *data, uint16_t size, int timeout);
-extern int usb_bulk_msg(struct usb_device *dev, unsigned int pipe, void *data, int len, int *actual_length, int timeout);
-extern int usb_submit_int_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len, int interval);
-extern void usb_disable_asynch(int disable);
-extern int usb_maxpacket(struct usb_device *dev, uint32_t pipe);
-
-extern int usb_get_configuration_no(struct usb_device *dev, uint8_t *buffer, int cfgno);
-extern int usb_get_report(struct usb_device *dev, int ifnum, uint8_t type, uint8_t id, void *buf, int size);
-extern int usb_get_class_descriptor(struct usb_device *dev, int ifnum, uint8_t type, uint8_t id, void *buf, int size);
-extern int usb_clear_halt(struct usb_device *dev, int pipe);
-extern int usb_string(struct usb_device *dev, int index, char *buf, size_t size);
-extern int usb_set_interface(struct usb_device *dev, int interface, int alternate);
+int usb_set_protocol(struct usb_device *dev, int ifnum, int protocol);
+int usb_set_idle(struct usb_device *dev, int ifnum, int duration, int report_id);
+struct usb_device *usb_get_dev_index(int index, int bus);
+int usb_control_msg(struct usb_device *dev, unsigned int pipe, uint8_t request, uint8_t requesttype, uint16_t value, 
+ uint16_t index, void *data, uint16_t size, int timeout);
+int usb_bulk_msg(struct usb_device *dev, unsigned int pipe, void *data, int len, int *actual_length, int timeout);
+int usb_submit_int_msg(struct usb_device *dev, uint32_t pipe, void *buffer, int transfer_len, int interval);
+void usb_disable_asynch(int disable);
+int usb_maxpacket(struct usb_device *dev, uint32_t pipe);
+void wait_ms(uint32_t ms);
+int usb_get_configuration_no(struct usb_device *dev, uint8_t *buffer, int cfgno);
+int usb_get_report(struct usb_device *dev, int ifnum, uint8_t type, uint8_t id, void *buf, int size);
+int usb_get_class_descriptor(struct usb_device *dev, int ifnum, uint8_t type, uint8_t id, void *buf, int size);
+int usb_clear_halt(struct usb_device *dev, int pipe);
+int usb_string(struct usb_device *dev, int index, char *buf, size_t size);
+int usb_set_interface(struct usb_device *dev, int interface, int alternate);

 /*
 * Calling this entity a "pipe" is glorifying it. A USB pipe
@@ -388,22 +391,19 @@ extern int usb_set_interface(struct usb_device *dev, int interface, int alternat
 /*************************************************************************
 * Hub Stuff
 */
-struct usb_port_status
-{
+struct usb_port_status {
 	uint16_t wPortStatus;
 	uint16_t wPortChange;
 } __attribute__ ((packed));

-struct usb_hub_status
-{
+struct usb_hub_status {
 	uint16_t wHubStatus;
 	uint16_t wHubChange;
 } __attribute__ ((packed));


 /* Hub descriptor */
-struct usb_hub_descriptor
-{
+struct usb_hub_descriptor {
 	uint8_t  bLength;
 	uint8_t  bDescriptorType;
 	uint8_t  bNbrPorts;
@@ -417,8 +417,7 @@ struct usb_hub_descriptor
 } __attribute__ ((packed));


-struct usb_hub_device
-{
+struct usb_hub_device {
 	struct usb_device *pusb_dev;
 	struct usb_hub_descriptor desc;
 };
--- a/include/usb_hub.h
+++ b/include/usb_hub.h
@@ -1,10 +0,0 @@
-#ifndef USB_HUB_H
-#define USB_HUB_H
-
-extern int bus_index;
-
-extern void usb_hub_reset(int bus_index);
-extern int usb_hub_probe(struct usb_device *dev, int ifnum);
-extern int hub_port_reset(struct usb_device *dev, int port, unsigned short *portstat);
-
-#endif // USB_HUB_H
--- a/include/util.h
+++ b/include/util.h
@@ -25,7 +25,7 @@
 #ifndef UTIL_H_
 #define UTIL_H_

-#include <bas_types.h>
+#include <stdint.h>

 #define NOP() __asm__ __volatile__("nop\n\t" : : : "memory")

--- a/include/version.h
+++ b/include/version.h
@@ -29,7 +29,7 @@
 */

 #define MAJOR_VERSION	0
-#define MINOR_VERSION	86
+#define MINOR_VERSION	84


 #endif /* VERSION_H_ */
--- a/include/video.h
+++ b/include/video.h
@@ -1,7 +1,9 @@
 #ifndef _VIDEO_H_
 #define _VIDEO_H_

-#include <bas_types.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
 #include "bas_printf.h"

 extern void video_init(void);
--- a/include/wait.h
+++ b/include/wait.h
@@ -44,11 +44,6 @@
 typedef bool (*checker_func)(void);

 extern void wait(uint32_t);
-inline static void udelay(long us)
-{
-    wait((uint32_t) us);
-}
-
 extern bool waitfor(uint32_t us, checker_func condition);
 extern uint32_t get_timer(void);
 extern void wait_ms(uint32_t ms);
--- a/include/x86debug.h
+++ b/include/x86debug.h
@@ -37,7 +37,7 @@
 ****************************************************************************/
 /* $XFree86: xc/extras/x86emu/src/x86emu/x86emu/debug.h,v 1.4 2000/11/21 23:10:27 tsi Exp $ */

-#include <bas_types.h>
+#include <stdint.h>
 #include "bas_printf.h"

 /*
--- a/kbd/ikbd.c
+++ b/kbd/ikbd.c
@@ -18,7 +18,7 @@

 */

-#include <bas_types.h>
+#include <stdint.h>
 #include "bas_printf.h"
 #include "bas_string.h"

--- a/net/am79c874.c
+++ b/net/am79c874.c
@@ -26,7 +26,7 @@
 #define dbg(format, arg...) do { ; } while (0)
 #endif /* DBG_AM79 */

-
+/********************************************************************/
 /* Initialize the AM79C874 PHY
 *
 * This function sets up the Auto-Negotiate Advertisement register
--- a/net/arp.c
+++ b/net/arp.c
@@ -13,7 +13,7 @@

 //#define DBG_ARP
 #ifdef DBG_ARP
-#define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
+#define dbg(format, arg...) do { xprintf("DEBUG: " format, ##arg); } while (0)
 #else
 #define dbg(format, arg...) do { ; } while (0)
 #endif /* DBG_ARP */
@@ -227,10 +227,13 @@ void arp_request(NIF *nif, uint8_t *pa)
 	arp_frame_hdr *arpframe;
 	int i, result;

+
+	dbg("%s\r\n", __FUNCTION__);
+
 	pNbuf = nbuf_alloc();
 	if (pNbuf == NULL)
 	{
-        dbg("could not allocate Tx buffer\n");
+		dbg("%s: arp_request couldn't allocate Tx buffer\n", __FUNCTION__);
 		return;
 	}

@@ -260,7 +263,7 @@ void arp_request(NIF *nif, uint8_t *pa)
 	pNbuf->length = ARP_HDR_LEN;

 	/* Send the ARP request */
-    dbg("sending ARP request\r\n");
+	dbg("%s: sending ARP request\r\n", __FUNCTION__);
 	result = nif->send(nif, nif->broadcast, nif->hwa, ETH_FRM_ARP, pNbuf);

 	if (result == 0)
@@ -312,11 +315,11 @@ uint8_t *arp_resolve(NIF *nif, uint16_t protocol, uint8_t *pa)
 		timer_set_secs(TIMER_NETWORK, ARP_TIMEOUT);
 		while (timer_get_reference(TIMER_NETWORK))
 		{
-            dbg("try to resolve %d.%d.%d.%d\r\n",
+			dbg("%s: try to resolve %d.%d.%d.%d\r\n", __FUNCTION__,
 				pa[0], pa[1], pa[2], pa[3], pa[4]);
 			if (arp_resolve_pa(nif, protocol, pa, &hwa))
 			{
-                dbg("resolved to %02x:%02x:%02x:%02x:%02x:%02x.\r\n",
+				dbg("%s: resolved to %02x:%02x:%02x:%02x:%02x:%02x.\r\n", __FUNCTION__,
 					hwa[0], hwa[1], hwa[2], hwa[3], hwa[4], hwa[5], hwa[6]);
 					
 				return hwa;
@@ -366,7 +369,6 @@ void arp_handler(NIF *nif, NBUF *pNbuf)
 			(rx_arpframe->ar_pro != ETH_FRM_IP) ||
 			(rx_arpframe->ar_pln != 4))
 	{
-        dbg("received packet is not an ARP packet, discard it\r\n");
 		nbuf_free(pNbuf);
 		return;
 	}
@@ -382,14 +384,10 @@ void arp_handler(NIF *nif, NBUF *pNbuf)
 			(rx_arpframe->ar_tpa[2] == addr[2]) &&
 			(rx_arpframe->ar_tpa[3] == addr[3]) )
 	{
-        dbg("received ARP packet is a permanent one, store it\r\n");
 		longevity = ARP_ENTRY_PERM;
 	}
 	else 
-    {
-        dbg("received ARP packet was not addressed to us, keep only temporarily\r\n");
 		longevity = ARP_ENTRY_TEMP;
-    }

 	/* 
 	 * Add ARP info into the table
@@ -414,7 +412,6 @@ void arp_handler(NIF *nif, NBUF *pNbuf)
 					(rx_arpframe->ar_tpa[2] == addr[2]) &&
 					(rx_arpframe->ar_tpa[3] == addr[3]) )
 			{
-                dbg("received arp request directed to us, replying\r\n");
 				/*
 				 * Reuse the current network buffer to assemble an ARP reply
 				 */
@@ -468,19 +465,12 @@ void arp_handler(NIF *nif, NBUF *pNbuf)
 						pNbuf);
 			}
 			else 
-            {
-                dbg("ARP request not addressed to us, discarding\r\n");
 				nbuf_free(pNbuf);
-            }
 			break;
-
 		case ARP_REPLY:
 			/*
 			 * The ARP Reply case is already taken care of
 			 */
-
-            /* missing break is intentional */
-
 		default:
 			nbuf_free(pNbuf);
 			break;
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -99,9 +99,7 @@ void bootp_handler(NIF *nif, NBUF *nbuf)
 	rx_p = (struct bootp_packet *) &nbuf->data[nbuf->offset];
 	udpframe = (udp_frame_hdr *) &nbuf->data[nbuf->offset - UDP_HDR_SIZE];

-    /*
-     * check packet if it is valid and if it is really intended for us
-     */
+	/* check packet if it is valid and if it is really intended for us */

 	if (rx_p->type == BOOTP_TYPE_BOOTREPLY && rx_p->xid == XID)
 	{
@@ -111,7 +109,6 @@ void bootp_handler(NIF *nif, NBUF *nbuf)
 	}
 	else
 	{
-        dbg("received invalid bootp reply\r\n");
 		/* not valid */
 		return;
 	}
--- a/net/fec.c
+++ b/net/fec.c
@@ -32,7 +32,7 @@
 #error Unknown machine!
 #endif

-// #define DBG_FEC
+#define DBG_FEC
 #ifdef DBG_FEC
 #define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
 #else
@@ -538,19 +538,12 @@ void fec_rx_start(uint8_t ch, int8_t *rxbd)
 {
 	uint32_t initiator;
 	int channel;
-#ifdef DBG_FEC
 	int res;
-#endif

 	/*
 	 * Make the initiator assignment
 	 */
-#if defined(DBG_FEC)
-    res =
-#else
-    (void)
-#endif
-    dma_set_initiator(DMA_FEC_RX(ch));
+	res = dma_set_initiator(DMA_FEC_RX(ch));
    dbg("dma_set_initiator(DMA_FEC_RX(%d)): %d\r\n", ch, res);

 	/*
@@ -851,21 +844,15 @@ void fec_tx_start(uint8_t ch, int8_t *txbd)
 {
 	uint32_t initiator;
 	int channel;
+	int result;
 	void fec0_tx_frame(void);
 	void fec1_tx_frame(void);
-#ifdef DBG_FEC
 	int res;
-#endif

 	/*
 	 * Make the initiator assignment
 	 */
-#ifdef DBG_FEC
-    res =
-#else
-    (void)
-#endif
-    dma_set_initiator(DMA_FEC_TX(ch));
+	res = dma_set_initiator(DMA_FEC_TX(ch));
    dbg("dma_set_initiator(%d) = %d\r\n", ch, res);

 	/*
@@ -1047,6 +1034,7 @@ void fec1_tx_frame(void)
 	fec_tx_frame(1);
 }

+/********************************************************************/
 /*
 * Send a packet out the selected FEC
 *
@@ -1120,6 +1108,7 @@ int fec1_send(NIF *nif, uint8_t *dst, uint8_t *src, uint16_t type, NBUF *nbuf)
 	return fec_send(1, nif, dst, src, type, nbuf);
 }

+/********************************************************************/
 /*
 * Enable interrupts on the selected FEC
 *
@@ -1156,7 +1145,7 @@ void fec_irq_enable(uint8_t ch, uint8_t lvl, uint8_t pri)
 		MCF_INTC_IMRH &= ~MCF_INTC_IMRH_INT_MASK38;
 }

-
+/********************************************************************/
 /*
 * Disable interrupts on the selected FEC
 *
@@ -1180,6 +1169,7 @@ void fec_irq_disable(uint8_t ch)
 		MCF_INTC_IMRH |= MCF_INTC_IMRH_INT_MASK38;
 }

+/********************************************************************/
 /*
 * FEC interrupt handler
 * All interrupts are multiplexed into a single vector for each
@@ -1294,7 +1284,7 @@ static void fec_irq_handler(uint8_t ch)
 */
 int fec0_interrupt_handler(void* arg1, void* arg2)
 {
-    (void) arg1;    /* not used */
+	(void) arg1;
 	(void) arg2;

 	fec_irq_handler(0);
@@ -1304,7 +1294,7 @@ int fec0_interrupt_handler(void* arg1, void* arg2)

 int fec1_interrupt_handler(void* arg1, void* arg2)
 {
-    (void) arg1;    /* not used */
+	(void) arg1;
 	(void) arg2;

 	fec_irq_handler(1);
@@ -1312,6 +1302,7 @@ int fec1_interrupt_handler(void* arg1, void* arg2)
 	return 1;
 }

+/********************************************************************/
 /*
 * Configure the selected Ethernet port and enable all operations
 *
@@ -1380,6 +1371,7 @@ void fec_eth_setup(uint8_t ch, uint8_t trcvr, uint8_t speed, uint8_t duplex, con
 	MCF_FEC_ECR(ch) |= MCF_FEC_ECR_ETHER_EN;
 }

+/********************************************************************/
 /*
 * Reset the selected Ethernet port
 *
@@ -1391,7 +1383,7 @@ void fec_eth_reset(uint8_t ch)
 	// To do
 }

-
+/********************************************************************/
 /*
 * Stop the selected Ethernet port
 *
--- a/net/ip.c
+++ b/net/ip.c
@@ -6,10 +6,11 @@
 *
 * Modifications:
 */
-#include <bas_types.h>
 #include "net.h"
 #include "bas_printf.h"
 #include "bas_string.h"
+#include <stdint.h>
+#include <stddef.h>


 #define IP_DEBUG
--- a/net/nbuf.c
+++ b/net/nbuf.c
@@ -12,9 +12,9 @@
 #include "bas_printf.h"


-#define DBG_NBUF
+//#define DBG_NBUF
 #if defined(DBG_NBUF)
-#define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
+#define dbg(format, arg...) do { xprintf("DEBUG: " format, ##arg); } while (0)
 #else
 #define dbg(format, arg...) do { ; } while (0)
 #endif /* DBG_NBUF */
@@ -48,7 +48,7 @@ int nbuf_init(void)
 		queue_init(&nbuf_queue[i]);
 	}

-	dbg("Creating %d net buffers of %d bytes\r\n", NBUF_MAX, NBUF_SZ);
+	dbg("%s: Creating %d net buffers of %d bytes\r\n", __FUNCTION__, NBUF_MAX, NBUF_SZ);

 	for (i = 0; i < NBUF_MAX; ++i)
 	{
@@ -76,7 +76,7 @@ int nbuf_init(void)
 		queue_add(&nbuf_queue[NBUF_FREE], (QNODE *)nbuf);
 	}

-	dbg("NBUF allocation complete\r\n");
+	dbg("%s: NBUF allocation complete\r\n", __FUNCTION__);

 	return 0;
 }
@@ -87,8 +87,7 @@ int nbuf_init(void)
 void nbuf_flush(void)
 {
 	NBUF *nbuf;
-	int i;
-	int level = set_ipl(7);
+	int i, level = set_ipl(7);
 	int n = 0;

 	for (i = 0; i < NBUF_MAX; ++i)
@@ -177,8 +176,7 @@ void nbuf_add(int q, NBUF *nbuf)
 void nbuf_reset(void)
 {
 	NBUF *nbuf;
-	int i;
-	int level = set_ipl(7);
+	int i, level = set_ipl(7);

 	for (i = 1; i < NBUF_MAXQ; ++i)
 	{
@@ -195,9 +193,7 @@ void nbuf_debug_dump(void)
 {
 #ifdef DBG_NBUF
 	NBUF *nbuf;
-	int i;
-	int j;
-	int level;
+	int i, j, level;

 	level = set_ipl(7);

@@ -208,7 +204,6 @@ void nbuf_debug_dump(void)
 		dbg("--------------------------------------\r\n");
 		j = 0;
 		nbuf = (NBUF *) queue_peek(&nbuf_queue[i]);
-
 		while (nbuf != NULL)
 		{
 			dbg("%d\t0x%08x\t0x%04x\t0x%04x\r\n", j++, nbuf->data,
--- a/net/net_timer.c
+++ b/net/net_timer.c
@@ -5,15 +5,16 @@
 *
 * Notes:
 */
-
 #include "net_timer.h"
+#include <stdint.h>
+#include <stdbool.h>
 #include "bas_printf.h"
 #include "MCF5475.h"
 #include "interrupts.h"

 //#define DBG_TMR
 #ifdef DBG_TMR
-#define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
+#define dbg(format, arg...) do { xprintf("DEBUG: " format, ##arg); } while (0)
 #else
 #define dbg(format, arg...) do { ; } while (0)
 #endif /* DBG_TMR */
@@ -47,7 +48,7 @@ int timer_default_isr(void *not_used, NET_TIMER *t)
 	 */
 	MCF_GPT_GMS(t->ch) = 0;

-	dbg("timer isr called for timer channel %d\r\n");
+	dbg("%s: timer isr called for timer channel %d\r\n", __FUNCTION__);

 	/*
 	 * Clear the reference - the desired seconds have expired
@@ -132,7 +133,8 @@ bool timer_init(uint8_t ch, uint8_t lvl, uint8_t pri)
 	 */
 	if (!((ch <= 3) && (lvl <= 7) && (lvl >= 1) && (pri <= 7)))
 	{
-		dbg("illegal parameters (ch=%d, lvl=%d, pri=%d)\r\n", ch, lvl, pri);
+		dbg("%s: illegal parameters (ch=%d, lvl=%d, pri=%d)\r\n", __FUNCTION__,
+				ch, lvl, pri);

 		return false;
 	}
@@ -158,10 +160,10 @@ bool timer_init(uint8_t ch, uint8_t lvl, uint8_t pri)
 				(void *) &net_timer[ch])
 	   )
 	{
-		dbg("could not register timer interrupt handler\r\n");
+		dbg("%s: could not register timer interrupt handler\r\n", __FUNCTION__);
 		return false;
 	}
-	dbg("timer handler registered\r\n", __FUNCTION__);
+	dbg("%s: timer handler registered\r\n", __FUNCTION__);

 	/*
 	 * Calculate the require CNT value to get a 1 second timeout
--- a/net/nif.c
+++ b/net/nif.c
@@ -11,9 +11,12 @@
 #include "bas_types.h"
 #include "bas_printf.h"

+#include <stdint.h>
+#include <stdbool.h>
+
 #define DBG_NIF
 #ifdef DBG_NIF
-#define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
+#define dbg(format, arg...) do { xprintf("DEBUG: " format, ##arg); } while (0)
 #else
 #define dbg(format, arg...) do { ; } while (0)
 #endif /* DBG_NIF */
@@ -53,13 +56,13 @@ void nif_protocol_handler(NIF *nif, uint16_t protocol, NBUF *pNbuf)
 	{
 		if (nif->protocol[index].protocol == protocol)
 		{
-			dbg("call protocol handler for protocol %d at %p\r\n", protocol,
+			dbg("%s: call protocol handler for protocol %d at %p\r\n", __FUNCTION__, protocol,
 						nif->protocol[index].handler);
 			nif->protocol[index].handler(nif,pNbuf);
 			return;
 		}
 	}
-	dbg("no protocol handler found for protocol %d\r\n", protocol);
+	dbg("%s: no protocol handler found for protocol %d\r\n", __FUNCTION__, protocol);
 }

 void *nif_get_protocol_info(NIF *nif, uint16_t protocol)
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -9,7 +9,10 @@
 *
 */

-#include "bas_types.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
 #include "bas_printf.h"
 #include "bas_string.h"
 #include "net.h"
--- a/net/udp.c
+++ b/net/udp.c
@@ -14,7 +14,7 @@

 //#define DBG_UDP
 #if defined(DBG_UDP)
-#define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
+#define dbg(format, arg...) do { xprintf("DEBUG: " format "\r\n", ##arg); } while (0)
 #else
 #define dbg(format, arg...) do { ; } while (0)
 #endif /* DBG_UDP */
@@ -112,7 +112,7 @@ int udp_send(NIF *nif, uint8_t *dest, int sport, int dport, NBUF *pNbuf)

 	if (nif == NULL)
 	{
-        dbg("nif is NULL\r\n");
+		dbg("%s: nif is NULL\r\n", __FUNCTION__);
 		return 0;
 	}

@@ -141,7 +141,7 @@ int udp_send(NIF *nif, uint8_t *dest, int sport, int dport, NBUF *pNbuf)

 	myip = ip_get_myip(nif_get_protocol_info(nif, ETH_FRM_IP));

-    dbg("sent UDP request to %d.%d.%d.%d from %d.%d.%d.%d\r\n",
+	dbg("%s: sent UDP request to %d.%d.%d.%d from %d.%d.%d.%d\r\n", __FUNCTION__,
 			dest[0], dest[1], dest[2], dest[3],
 			myip[0], myip[1], myip[2], myip[3]);

@@ -159,7 +159,7 @@ void udp_handler(NIF *nif, NBUF *pNbuf)

 	udpframe = (udp_frame_hdr *) &pNbuf->data[pNbuf->offset];

-    dbg("packet received\r\n",);
+	dbg("%s: packet received\r\n", __FUNCTION__);

 	/*
 	 * Adjust the length and valid data offset of the packet we are
@@ -176,7 +176,7 @@ void udp_handler(NIF *nif, NBUF *pNbuf)
 		handler(nif, pNbuf);
 	else
 	{
-        dbg("received UDP packet for non-supported port\n");
+		dbg("%s: received UDP packet for non-supported port\n", __FUNCTION__);
 		nbuf_free(pNbuf);
 	}

--- a/pci/ehci-hcd.c
+++ b/pci/ehci-hcd.c
@@ -31,8 +31,8 @@

 //extern xQueueHandle queue_poll_hub;

-//#undef DEBUG
-//#undef SHOW_INFO
+#undef DEBUG
+#undef SHOW_INFO

 static char ehci_inited;
 static int rootdev;
--- a/pci/ohci-hcd.c
+++ b/pci/ohci-hcd.c
@@ -43,6 +43,9 @@
 */


+#include "usb.h"
+#include "ohci.h"
+#include "util.h"			/* for endian conversions */
 #include "wait.h"			/* for wait routines */
 #include "bas_printf.h"
 #include "bas_string.h"	/* for memset() */
@@ -50,22 +53,22 @@

 //extern xQueueHandle queue_poll_hub;

+
+#undef DEBUG_PCIE
+
 #undef OHCI_USE_NPS /* force NoPowerSwitching mode */

 #undef OHCI_VERBOSE_DEBUG	/* not always helpful */
+#undef DEBUG
 #undef SHOW_INFO
 #undef OHCI_FILL_TRACE

-//#define DEBUG_OHCI
-#ifdef DEBUG_OHCI
-#define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
+//#define DEBUG
+#ifdef DEBUG
+#define debug_printf(format, arg...) do { xprintf("DEBUG: " format "\r\n", ##arg); } while (0)
 #else
-#define dbg(format, arg...) do { ; } while (0)
-#endif /* DEBUG_OHCI */
-
-#include "usb.h"
-#include "ohci.h"
-#include "util.h"			/* for endian conversions */
+#define debug_printf(format, arg...) do { ; } while (0)
+#endif /* DEBUG */

 /* For initializing controller (mask in an HCFS mode too) */
 #define OHCI_CONTROL_INIT (OHCI_CTRL_CBSR & 0x3) | OHCI_CTRL_IE | OHCI_CTRL_PLE
@@ -76,26 +79,26 @@

 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
 #ifdef CONFIG_SYS_OHCI_SWAP_REG_ACCESS
-
 /*
- * do a longword read from addr and byteswap the result
+#define readl(a) swpl(*((volatile uint32_t *)(a)))
 */
 inline uint32_t readl(volatile uint32_t *addr)
 {
 	uint32_t res;

+	//debug_printf("reading from 0x%08x in %s, %d", addr, __FILE__, __LINE__);
 	res = swpl(*addr);
-	//chip_errata_135();
-	//dbg("reading from 0x%08x = 0x%08x\r\n", addr, res);
+	chip_errata_135();
+	//debug_printf(" result=0x%08x\r\n", res);
 	return res;
 }

 /*
- * byteswap value and write it to address
+#define writel(a, b) {debug_printf("writing %08x to %08x\r\n", (a), (b)); *((volatile uint32_t *)(b)) = swpl((volatile uint32_t)(a)); }
 */
 inline void writel(uint32_t value, uint32_t *address)
 {
-	// dbg("writing %08x to %08x\r\n", value, address);
+	//debug_printf("writing %08x to %08x in %s, %d\r\n", value, address, __FILE__, __LINE__);
 	* (volatile uint32_t *) address = swpl(value);
 }
 #else
@@ -149,8 +152,16 @@ struct pci_device_id ohci_usb_pci_table[] =
 	}
 };

-#define err(format, arg...) do { dbg("ERROR: " format "\r\n", ## arg); } while (0)
-#define info(format, arg...)  dbg("INFO: " format "\r\n", ## arg)
+#define DEBUG
+#ifdef DEBUG
+#define dbg(format, arg...) do {debug_printf("DEBUG: " format "\r\n", ## arg);} while(0)
+#else
+#define dbg(format, arg...) do {} while (0)
+#endif /* DEBUG */
+#define err(format, arg...) do {debug_printf("ERROR: " format "\r\n", ## arg); }while(0)
+#define info(format, arg...)  debug_printf("INFO: " format "\r\n", ## arg)
+
+extern void udelay(long usec);

 /* global ohci_t */
 static ohci_t gohci[2];
@@ -220,7 +231,7 @@ static void urb_free_priv(urb_priv_t *urb)

 /*-------------------------------------------------------------------------*/

-#ifdef DEBUG_OHCI
+#ifdef DEBUG
 static int sohci_get_current_frame_number(ohci_t *ohci, struct usb_device *dev);

 /* debug| print the main components of an URB
@@ -230,7 +241,7 @@ static void pkt_print(ohci_t *ohci, urb_priv_t *purb, struct usb_device *dev,
 		      uint32_t pipe, void *buffer, int transfer_len,
 		      struct devrequest *setup, char *str, int small)
 {
-	dbg("%s URB:[%4x] dev:%2lu,ep:%2lu-%c,type:%s,len:%d/%d stat:%#lx\r\n",
+	dbg("%s URB:[%4x] dev:%2lu,ep:%2lu-%c,type:%s,len:%d/%d stat:%#lx",
 			str,
 			sohci_get_current_frame_number(ohci, dev),
 			usb_pipedevice(pipe),
@@ -249,29 +260,27 @@ static void pkt_print(ohci_t *ohci, urb_priv_t *purb, struct usb_device *dev,
 		
 		if (usb_pipecontrol(pipe))
 		{
-			dbg(__FILE__ ": cmd(8):");
+			debug_printf(__FILE__ ": cmd(8):");
 			for (i = 0; i < 8 ; i++)
-				dbg(" %02x", ((uint8_t *)setup)[i]);
-			dbg("\r\n");
+				debug_printf(" %02x", ((uint8_t *)setup)[i]);
+			debug_printf("\r\n");
 		}

 		if (transfer_len > 0 && buffer)
 		{
-			dbg(__FILE__ ": data(%d/%d):", (purb ? purb->actual_length : 0), transfer_len);
+			debug_printf(__FILE__ ": data(%d/%d):", (purb ? purb->actual_length : 0), transfer_len);
 			len = usb_pipeout(pipe)? transfer_len : (purb ? purb->actual_length : 0);

 			for (i = 0; i < 16 && i < len; i++)
-				dbg(" %02x", ((uint8_t *)buffer)[i]);
-			dbg("%s\r\n", i < len? "...": "");
+				debug_printf(" %02x", ((uint8_t *)buffer)[i]);
+			debug_printf("%s\r\n", i < len? "...": "");
 		}
 	}
 #endif
 }

-/*
- * just for debugging; prints non-empty branches of the int ed tree
- * inclusive iso eds
- */
+/* just for debugging; prints non-empty branches of the int ed tree
+ * inclusive iso eds */
 static void ep_print_int_eds(ohci_t *ohci, char *str)
 {
 	int i, j;
@@ -284,20 +293,20 @@ static void ep_print_int_eds(ohci_t *ohci, char *str)
 		if (*ed_p == 0)
 			continue;

-		dbg("%s branch int %2d(%2x):\r\n", str, i, i);
+		debug_printf(__FILE__ ": %s branch int %2d(%2x):", str, i, i);
 		while (*ed_p != 0 && j--)
 		{
 			ed_t *ed = (ed_t *)swpl((uint32_t)ed_p);
-			dbg(" ed: %4x;", ed->hwINFO);
+			debug_printf(" ed: %4x;", ed->hwINFO);
 			ed_p = &ed->hwNextED;
 		}
-		dbg("\r\n");
+		debug_printf("\r\n");
 	}
 }

 static void ohci_dump_intr_mask(char *label, uint32_t mask)
 {
-	dbg("%s: 0x%08x%s%s%s%s%s%s%s%s%s\r\n",
+	dbg("%s: 0x%08x%s%s%s%s%s%s%s%s%s",
 		label,
 		mask,
 		(mask & OHCI_INTR_MIE) ? " MIE" : "",
@@ -322,14 +331,15 @@ static void maybe_print_eds(ohci_t *controller, char *label, uint32_t value)

 	if (value && (value < 0xDFFFF0))  /* STRAM */
 	{
-		dbg("%s %08x\r\n", label, value);
-		dbg("%08x\r\n", edp->hwINFO);
-		dbg("%08x\r\n", edp->hwTailP);
-		dbg("%08x\r\n", edp->hwHeadP);
-		dbg("%08x\r\n", edp->hwNextED);
+		dbg("%s %08x", label, value);
+		dbg("%08x", edp->hwINFO);
+		dbg("%08x", edp->hwTailP);
+		dbg("%08x", edp->hwHeadP);
+		dbg("%08x", edp->hwNextED);
 	}
 }

+#ifdef DEBUG
 static char *hcfs2string(int state)
 {
 	switch (state)
@@ -341,18 +351,17 @@ static char *hcfs2string(int state)
 	}
 	return "?";
 }
+#endif

 /* dump control and status registers */
 static void ohci_dump_status(ohci_t *controller)
 {
 	struct ohci_regs	*regs = controller->regs;
 	uint32_t	temp = readl(&regs->revision) & 0xff;
-
 	if (temp != 0x10)
-		dbg("spec %d.%d\r\n", (temp >> 4), (temp & 0x0f));
-
+		dbg("spec %d.%d", (temp >> 4), (temp & 0x0f));
 	temp = readl(&regs->control);
-	dbg("control: 0x%08x%s%s%s HCFS=%s%s%s%s%s CBSR=%d\r\n", temp,
+	dbg("control: 0x%08x%s%s%s HCFS=%s%s%s%s%s CBSR=%d", temp,
 		(temp & OHCI_CTRL_RWE) ? " RWE" : "",
 		(temp & OHCI_CTRL_RWC) ? " RWC" : "",
 		(temp & OHCI_CTRL_IR) ? " IR" : "",
@@ -363,9 +372,8 @@ static void ohci_dump_status(ohci_t *controller)
 		(temp & OHCI_CTRL_PLE) ? " PLE" : "",
 		temp & OHCI_CTRL_CBSR
 		);
-
 	temp = readl(&regs->cmdstatus);
-	dbg("cmdstatus: 0x%08x SOC=%d%s%s%s%s\r\n", temp,
+	dbg("cmdstatus: 0x%08x SOC=%d%s%s%s%s", temp,
 		(temp & OHCI_SOC) >> 16,
 		(temp & OHCI_OCR) ? " OCR" : "",
 		(temp & OHCI_BLF) ? " BLF" : "",
@@ -395,7 +403,7 @@ static void ohci_dump_roothub(ohci_t *controller, int verbose)
 	ndp = controller->ndp;
 	if (verbose)
 	{
-		dbg("roothub.a: %08x POTPGT=%d%s%s%s%s%s NDP=%d\r\n", temp,
+		dbg("roothub.a: %08x POTPGT=%d%s%s%s%s%s NDP=%d", temp,
 			((temp & RH_A_POTPGT) >> 24) & 0xff,
 			(temp & RH_A_NOCP) ? " NOCP" : "",
 			(temp & RH_A_OCPM) ? " OCPM" : "",
@@ -405,13 +413,13 @@ static void ohci_dump_roothub(ohci_t *controller, int verbose)
 			ndp
 			);
 		temp = roothub_b(controller);
-		dbg("roothub.b: %08x PPCM=%04x DR=%04x\r\n",
+		dbg("roothub.b: %08x PPCM=%04x DR=%04x",
 			temp,
 			(temp & RH_B_PPCM) >> 16,
 			(temp & RH_B_DR)
 			);
 		temp = roothub_status(controller);
-		dbg("roothub.status: %08x%s%s%s%s%s%s\r\n",
+		dbg("roothub.status: %08x%s%s%s%s%s%s",
 			temp,
 			(temp & RH_HS_CRWE) ? " CRWE" : "",
 			(temp & RH_HS_OCIC) ? " OCIC" : "",
@@ -425,7 +433,7 @@ static void ohci_dump_roothub(ohci_t *controller, int verbose)
 	for (i = 0; i < ndp; i++)
 	{
 		temp = roothub_portstatus(controller, i);
-		dbg("roothub.portstatus [%d] = 0x%08x%s%s%s%s%s%s%s%s%s%s%s%s\r\n",
+		dbg("roothub.portstatus [%d] = 0x%08x%s%s%s%s%s%s%s%s%s%s%s%s",
 			i,
 			temp,
 			(temp & RH_PS_PRSC) ? " PRSC" : "",
@@ -448,19 +456,19 @@ static void ohci_dump_roothub(ohci_t *controller, int verbose)

 static void ohci_dump(ohci_t *ohci, int verbose)
 {
-	dbg("OHCI controller usb-%s-%c state\r\n", ohci->slot_name, (char)ohci->controller + '0');
+	dbg("OHCI controller usb-%s-%c state", ohci->slot_name, (char)ohci->controller + '0');
 	/* dumps some of the state we know about */
 	ohci_dump_status(ohci);
 	if (verbose)
 		ep_print_int_eds(ohci, "hcca");
-	dbg("hcca frame #%04x\r\n", ohci->hcca->frame_no);
+	dbg("hcca frame #%04x", ohci->hcca->frame_no);
 	ohci_dump_roothub(ohci, 1);
 }
-#endif /* DEBUG_OHCI */
+#endif /* DEBUG */

-/*
+/*-------------------------------------------------------------------------*
 * Interface functions (URB)
- */
+ *-------------------------------------------------------------------------*/

 /* get a transfer request */

@@ -476,25 +484,19 @@ static int sohci_submit_job(ohci_t *ohci, urb_priv_t *urb, struct devrequest *se
 	int transfer_len = urb->transfer_buffer_length;
 	int interval = urb->interval;

-	/*
-	 * when controller's hung, permit only roothub cleanup attempts
-	 * such as powering down ports
-	 */
+	/* when controller's hung, permit only roothub cleanup attempts
+	 * such as powering down ports */
 	if (ohci->disabled)
 	{
 		urb_free_priv(purb_priv); // added
-		err("sohci_submit_job: EPIPE\r\n");
-
+		err("sohci_submit_job: EPIPE");
 		return -1;
 	}
-
-	/*
-	 * we're about to begin a new transaction here so mark the
-	 * URB unfinished
-	 */
+	/* we're about to begin a new transaction here so mark the
+	 * URB unfinished */
 	urb->finished = 0;

-	/* every endpoint has an ed, locate and fill it */
+	/* every endpoint has a ed, locate and fill it */
 	ed = ep_add_ed(ohci, dev, pipe, interval, 1);
 	if (!ed)
 	{
@@ -509,11 +511,9 @@ static int sohci_submit_job(ohci_t *ohci, urb_priv_t *urb, struct devrequest *se
 		case PIPE_BULK: /* one TD for every 4096 Byte */
 			size = (transfer_len - 1) / 4096 + 1;
 			break;
-
 		case PIPE_CONTROL:/* 1 TD for setup, 1 for ACK and 1 for every 4096 B */
 			size = (transfer_len == 0) ? 2: (transfer_len - 1) / 4096 + 3;
 			break;
-
 		case PIPE_INTERRUPT: /* 1 TD */
 			size = 1;
 			break;
@@ -541,7 +541,7 @@ static int sohci_submit_job(ohci_t *ohci, urb_priv_t *urb, struct devrequest *se
 		{
 			purb_priv->length = i;
 			urb_free_priv(purb_priv);
-			err("sohci_submit_job: ENOMEM\r\n");
+			err("sohci_submit_job: ENOMEM");
 			return -1;
 		}
 	}
@@ -549,7 +549,7 @@ static int sohci_submit_job(ohci_t *ohci, urb_priv_t *urb, struct devrequest *se
 	if (ed->state == ED_NEW || (ed->state & ED_DEL))
 	{
 		urb_free_priv(purb_priv);
-		err("sohci_submit_job: EINVAL\r\n");
+		err("sohci_submit_job: EINVAL");
 		return -1;
 	}

@@ -574,11 +574,9 @@ static inline int sohci_return_job(ohci_t *ohci, urb_priv_t *urb)
 			{
 				writel(OHCI_INTR_WDH, &regs->intrenable);
 				readl(&regs->intrenable); /* PCI posting flush */
-
 				/* call interrupt device routine */
 // 				dbg("irq_handle device %d", urb->dev->devnum);
 				urb->dev->irq_handle(urb->dev);
-
 				writel(OHCI_INTR_WDH, &regs->intrdisable);
 				readl(&regs->intrdisable); /* PCI posting flush */
 			}
@@ -598,7 +596,7 @@ static inline int sohci_return_job(ohci_t *ohci, urb_priv_t *urb)

 /*-------------------------------------------------------------------------*/

-#ifdef DEBUG_OHCI
+#ifdef DEBUG
 /* tell us the current USB frame number */

 static int sohci_get_current_frame_number(ohci_t *ohci, struct usb_device *usb_dev)
@@ -611,20 +609,15 @@ static int sohci_get_current_frame_number(ohci_t *ohci, struct usb_device *usb_d
 * ED handling functions
 *-------------------------------------------------------------------------*/

-/*
- * search for the right branch to insert an interrupt ed into the int tree
- * do some load balancing;
+/* search for the right branch to insert an interrupt ed into the int tree
+ * do some load ballancing;
 * returns the branch and
- * sets the interval to interval = 2^integer (ld (interval))
- */
+ * sets the interval to interval = 2^integer (ld (interval)) */

-static int ep_int_balance(ohci_t *ohci, int interval, int load)
+static int ep_int_ballance(ohci_t *ohci, int interval, int load)
 {
-	int i;
-	int branch = 0;
-
-	/*
-	 * search for the least loaded interrupt endpoint
+	int i, branch = 0;
+	/* search for the least loaded interrupt endpoint
 	 * branch of all 32 branches
 	 */
 	for (i = 0; i < 32; i++)
@@ -652,11 +645,9 @@ static int ep_2_n_interval(int inter)

 /*-------------------------------------------------------------------------*/

-/*
- * the int tree is a binary tree
+/* the int tree is a binary tree
 * in order to process it sequentially the indexes of the branches have to
- * be mapped the mapping reverses the bits of a word of num_bits length
- */
+ * be mapped the mapping reverses the bits of a word of num_bits length */
 static int ep_rev(int num_bits, int word)
 {
 	int i;
@@ -664,7 +655,6 @@ static int ep_rev(int num_bits, int word)

 	for (i = 0; i < num_bits; i++)
 		wout |= (((word >> i) & 1) << (num_bits - i - 1));
-
 	return wout;
 }

@@ -723,7 +713,7 @@ static int ep_link(ohci_t *ohci, ed_t *edi)
 			load = ed->int_load;
 			interval = ep_2_n_interval(ed->int_period);
 			ed->int_interval = interval;
-			int_branch = ep_int_balance(ohci, interval, load);
+			int_branch = ep_int_ballance(ohci, interval, load);
 			ed->int_branch = int_branch;
 			for (i = 0; i < ep_rev(6, interval); i += inter)
 			{
@@ -762,12 +752,10 @@ static void periodic_unlink(struct ohci *ohci, volatile struct ed *ed, unsigned
 	}
 }

-/*
- * unlink an ed from one of the HC chains.
+/* unlink an ed from one of the HC chains.
 * just the link to the ed is unlinked.
 * the link from the ed still points to another operational ed or 0
- * so the HC can eventually finish the processing of the unlinked ed
- */
+ * so the HC can eventually finish the processing of the unlinked ed */

 static int ep_unlink(ohci_t *ohci, ed_t *edi)
 {
@@ -807,7 +795,6 @@ static int ep_unlink(ohci_t *ohci, ed_t *edi)
 			}
 			else
 				ed->ed_prev->hwNextED = ed->hwNextED;
-
 			if (ohci->ed_bulktail == ed)
 				ohci->ed_bulktail = ed->ed_prev;
 			else
@@ -826,8 +813,7 @@ static int ep_unlink(ohci_t *ohci, ed_t *edi)

 /*-------------------------------------------------------------------------*/

-/*
- * add/reinit an endpoint; this should be done once at the
+/* add/reinit an endpoint; this should be done once at the
 * usb_set_configuration command, but the USB stack is a little bit
 * stateless so we do it at every transaction if the state of the ed
 * is ED_NEW then a dummy td is added and the state is changed to
@@ -910,8 +896,8 @@ static void td_fill(ohci_t *ohci, unsigned int info, void *data, int len,
 	if (usb_pipebulk(urb_priv->pipe) && usb_pipeout(urb_priv->pipe))
 	{
 		for (i = 0; i < len; i++)
-			dbg("td->data[%d] %#2x ", i, ((unsigned char *)td->data)[i]);
-		dbg("\r\n");
+			debug_printf("td->data[%d] %#2x ", i, ((unsigned char *)td->data)[i]);
+		debug_printf("\r\n");
 	}
 #endif
 	if (!len)
@@ -935,14 +921,14 @@ static void td_fill(ohci_t *ohci, unsigned int info, void *data, int len,
 	if (data)
 	{
 		int i;
-		dbg("td_fill: %08x %08x %08X %08X at 0x%08X\r\n",
+		debug_printf("td_fill: %08x %08x %08X %08X at 0x%08X\r\n", 
 		 swpl(td->hwINFO), swpl(td->hwCBP), swpl(td->hwNextTD), swpl(td->hwBE), td);
 		for (i = 0; i < len; i++)
-			dbg("%02X ", *(unsigned char *)(data + i) & 0xff);
-		dbg("\r\n");
+			debug_printf("%02X ", *(unsigned char *)(data + i) & 0xff);
+		debug_printf("\r\n");
 	}
 	else
-		dbg("td_fill: %08x %08x %08X %08X at 0x%08X\r\n",
+		debug_printf("td_fill: %08x %08x %08X %08X at 0x%08X\r\n", 
 		 swpl(td->hwINFO), swpl(td->hwCBP), swpl(td->hwNextTD), swpl(td->hwBE), td);
 #endif
 }
@@ -1063,7 +1049,7 @@ static void check_status(ohci_t *ohci, td_t *td_list)

 	if (cc)
 	{
-		err("OHCI usb-%s-%c error: %s (%x)\r\n", ohci->slot_name, (char) ohci->controller + '0', cc_to_string[cc], cc);
+		err("OHCI usb-%s-%c error: %s (%x)", ohci->slot_name, (char)ohci->controller + '0', cc_to_string[cc], cc);
 		if (*phwHeadP & swpl(0x1))
 		{
 			if (lurb_priv && ((td_list->index + 1) < urb_len))
@@ -1144,7 +1130,7 @@ static int takeback_td(ohci_t *ohci, td_t *td_list)
 	cc = TD_CC_GET(tdINFO);
 	if (cc)
 	{
-		//err("OHCI usb-%s-%c error: %s (%x)", ohci->slot_name, (char)ohci->controller + '0', cc_to_string[cc], cc);
+		err("OHCI usb-%s-%c error: %s (%x)", ohci->slot_name, (char)ohci->controller + '0', cc_to_string[cc], cc);
 		stat = cc_to_error[cc];
 	}

@@ -1287,7 +1273,7 @@ static unsigned char root_hub_str_index1[] =
 /*-------------------------------------------------------------------------*/

 #define OK(x)			len = (x); break
-#ifdef DEBUG_OHCI
+#ifdef DEBUG
 #define WR_RH_STAT(x)		{ info("WR:status %#8x", (x)); writel((x), &ohci->regs->roothub.status); }
 #define WR_RH_PORTSTAT(x)	{ info("WR:portstatus[%d] %#8x", wIndex-1, (x)); writel((x), &ohci->regs->roothub.portstatus[wIndex-1]); }
 #else
@@ -1339,7 +1325,7 @@ static int ohci_submit_rh_msg(ohci_t *ohci, struct usb_device *dev, uint32_t pip
 	uint16_t wIndex;
 	uint16_t wLength;

-#ifdef DEBUG_OHCI
+#ifdef DEBUG
 	pkt_print(ohci, NULL, dev, pipe, buffer, transfer_len, cmd, "SUB(rh)", usb_pipein(pipe));
 #else
 	if (ohci->irq)
@@ -1493,7 +1479,7 @@ static int ohci_submit_rh_msg(ohci_t *ohci, struct usb_device *dev, uint32_t pip
 			dbg("unsupported root hub command");
 			stat = USB_ST_STALLED;
 	}
-#ifdef DEBUG_OHCI
+#ifdef DEBUG
 	ohci_dump_roothub(ohci, 1);
 #else
 	if (ohci->irq)
@@ -1504,7 +1490,7 @@ static int ohci_submit_rh_msg(ohci_t *ohci, struct usb_device *dev, uint32_t pip
 		memcpy(data, data_buf, len);
 	dev->act_len = len;
 	dev->status = stat;
-#ifdef DEBUG_OHCI
+#ifdef DEBUG
 	pkt_print(ohci, NULL, dev, pipe, buffer, transfer_len, cmd, "RET(rh)", 0/*usb_pipein(pipe)*/);
 #else
 	if (ohci->irq)
@@ -1543,7 +1529,7 @@ static int submit_common_msg(ohci_t *ohci, struct usb_device *dev, uint32_t pipe
 		dev->status = USB_ST_CRC_ERR;
 		return 0;
 	}
-#ifdef DEBUG_OHCI
+#ifdef DEBUG
 	urb->actual_length = 0;
 	pkt_print(ohci, urb, dev, pipe, buffer, transfer_len, setup, "SUB", usb_pipein(pipe));
 #else
@@ -1623,7 +1609,7 @@ static int submit_common_msg(ohci_t *ohci, struct usb_device *dev, uint32_t pipe
 	}
 	dev->status = stat;
 	dev->act_len = transfer_len;
-#ifdef DEBUG_OHCI
+#ifdef DEBUG
 	pkt_print(ohci, urb, dev, pipe, buffer, transfer_len, setup, "RET(ctlr)", usb_pipein(pipe));
 #else
 	if (ohci->irq)
@@ -1647,7 +1633,7 @@ int ohci_submit_control_msg(struct usb_device *dev, uint32_t pipe, void *buffer,
 	ohci_t *ohci = (ohci_t *)dev->priv_hcd;
 	int maxsize = usb_maxpacket(dev, pipe);
 	info("submit_control_msg dev 0x%p ohci 0x%p", dev, ohci);
-#ifdef DEBUG_OHCI
+#ifdef DEBUG
 	pkt_print(ohci, NULL, dev, pipe, buffer, transfer_len, setup, "SUB", usb_pipein(pipe));
 #else
 	if (ohci->irq)
@@ -1686,23 +1672,21 @@ static int hc_reset(ohci_t *ohci)
 	int timeout = 30;
 	int smm_timeout = 50; /* 0,5 sec */

+	dbg("%s\r\n", __FUNCTION__);
+
 	if ((ohci->ent->vendor == PCI_VENDOR_ID_PHILIPS)
 			&& (ohci->ent->device ==  PCI_DEVICE_ID_PHILIPS_ISP1561))
 	{
 #define EHCI_USBCMD_OFF     0x20
 #define EHCI_USBCMD_HCRESET	(1 << 1)
-
-		/*
-		 * Some multi-function controllers (e.g. ISP1562) allow root hub
-		 * resetting via EHCI registers only.
-		 */
+		/* Some multi-function controllers (e.g. ISP1562) allow root hub
+		   resetting via EHCI registers only. */
 		short index = 0;
 		long handle;

 		do
 		{
 			handle = pci_find_device(0x0, 0xffff, index++);
-
 			if (handle >= 0)
 			{
 				uint32_t id = 0;
@@ -1748,23 +1732,20 @@ static int hc_reset(ohci_t *ohci)
 	if ((ohci->controller == 0) && (ohci->ent->vendor == PCI_VENDOR_ID_NEC)
 								&& (ohci->ent->device == PCI_DEVICE_ID_NEC_USB))
 	{
-		//if (ohci->handle == 1) /* NEC on motherboard has FPGA clock */
-#if defined(MACHINE_FIREBEE)
+		if (ohci->handle == 1) /* NEC on motherboard has FPGA clock */
 		{
 			dbg("USB OHCI set 48MHz clock\r\n");
 		 	pci_write_config_longword(ohci->handle, 0xE4, 0x21); // oscillator & disable ehci
 			wait(10);
 		}
-		//else
-#else
+		else
 		{
 		 	pci_write_config_longword(ohci->handle, 0xE4, pci_read_config_longword(ohci->handle, 0xE4) | 0x01); // disable ehci
 			wait(10);
 		}
-#endif
 	}

-	dbg("control: %x\r\n", readl(&ohci->regs->control));
+	debug_printf("control: %x\r\n", readl(&ohci->regs->control));
 	if (readl(&ohci->regs->control) & OHCI_CTRL_IR)
 	{
 		/* SMM owns the HC */
@@ -1783,19 +1764,12 @@ static int hc_reset(ohci_t *ohci)

 	/* Disable HC interrupts */
 	writel(OHCI_INTR_MIE, &ohci->regs->intrdisable);
-
-#ifdef DEBUG_OHCI
 	ohci_dump_status(ohci);
-#endif /* DEBUG_OHCI */
-
-	dbg("USB OHCI HC reset_hc usb-%s-%c: ctrl = 0x%X\r\n", ohci->slot_name,
-		(char) ohci->controller + '0', readl(&ohci->regs->control));
-
+	dbg("USB OHCI HC reset_hc usb-%s-%c: ctrl = 0x%X", ohci->slot_name, (char)ohci->controller + '0', readl(&ohci->regs->control));
 	/* Reset USB (needed by some controllers) */
 	ohci->hc_control = 0;
 	writel(ohci->hc_control, &ohci->regs->control);
 	wait(50);
-
 	/* HC Reset requires max 10 us delay */
 	writel(OHCI_HCR, &ohci->regs->cmdstatus);
 	while ((readl(&ohci->regs->cmdstatus) & OHCI_HCR) != 0)
@@ -1803,9 +1777,7 @@ static int hc_reset(ohci_t *ohci)
 		if (--timeout == 0)
 		{
 			err("USB HC reset timed out!");
-#ifdef DEBUG_OHCI
 	ohci_dump_status(ohci);
-#endif /* DEBUG_OHCI */
 			return -1;
 		}
 		wait(10);
@@ -1862,6 +1834,8 @@ static int hc_start(ohci_t *ohci)
 	return 0;
 }

+/*-------------------------------------------------------------------------*/
+
 static void flush_data_cache(ohci_t *ohci)
 {
 	/* flush caches here */
@@ -1949,16 +1923,11 @@ static int hc_interrupt(ohci_t *ohci)

 		(void) status;

-		err("OHCI Unrecoverable Error, controller usb-%s-%c disabled\r\n(SR:0x%04X%s%s%s%s%s%s)",
-			ohci->slot_name, (char)ohci->controller + '0', status & 0xFFFF,
-			status & 0x8000 ? ", Parity error" : "",
-			status & 0x4000 ? ", Signaled system error" : "",
-			status & 0x2000 ? ", Received master abort" : "",
-			status & 0x1000 ? ", Received target abort" : "",
-			status & 0x800 ? ", Signaled target abort" : "",
-			status & 0x100 ? ", Data parity error" : "");
+		err("OHCI Unrecoverable Error, controller usb-%s-%c disabled\r\n(SR:0x%04X%s%s%s%s%s%s)", ohci->slot_name, (char)ohci->controller + '0', status & 0xFFFF,
+		 status & 0x8000 ? ", Parity error" : "", status & 0x4000 ? ", Signaled system error" : "", status & 0x2000 ? ", Received master abort" : "",
+		 status & 0x1000 ? ", Received target abort" : "", status & 0x800 ? ", Signaled target abort" : "", status & 0x100 ? ", Data parity error" : "");
 		ohci->disabled++;
-#ifdef DEBUG_OHCI
+#ifdef DEBUG
 		ohci_dump(ohci, 1);
 #else
 		if (ohci->irq)
@@ -1977,7 +1946,6 @@ static int hc_interrupt(ohci_t *ohci)
 		writel(OHCI_INTR_WDH, &regs->intrdisable);
 		(void)readl(&regs->intrdisable); /* flush */
 		stat = dl_done_list(ohci);
-
 		writel(OHCI_INTR_WDH, &regs->intrenable);
 		(void)readl(&regs->intrdisable); /* flush */
 	}
@@ -1993,7 +1961,6 @@ static int hc_interrupt(ohci_t *ohci)
 	if (ints & OHCI_INTR_SF)
 	{
 		unsigned int frame = swpw(ohci->hcca->frame_no) & 1;
-
 		if (ohci->irq)
 			wait(1 * 1000);
 		writel(OHCI_INTR_SF, &regs->intrdisable);
@@ -2011,19 +1978,16 @@ static int handle_usb_interrupt(ohci_t *ohci)
 {
 	if (!ohci->irq_enabled)
 		return 0;
-
 	flush_data_cache(ohci);
 	ohci->irq = 0;
 	ohci->stat_irq = hc_interrupt(ohci);
 	ohci->irq = -1;
-
 	return 1; /* clear interrupt, 0: disable interrupt */
 }

 void ohci_usb_enable_interrupt(int enable)
 {
 	int i;
-
 	dbg("usb_enable_interrupt(%d)", enable);
 	for (i = 0; i < (sizeof(gohci) / sizeof(ohci_t)); i++)
 	{
@@ -2040,6 +2004,10 @@ void ohci_usb_enable_interrupt(int enable)

 #endif /* !CONFIG_USB_INTERRUPT_POLLING */

+/*-------------------------------------------------------------------------*/
+
+/*-------------------------------------------------------------------------*/
+
 /* De-allocate all resources.. */

 static void hc_release_ohci(ohci_t *ohci)
@@ -2068,6 +2036,7 @@ static void hc_free_buffers(ohci_t *ohci)
 	}
 }

+/*-------------------------------------------------------------------------*/
 /*
 * low level initalisation routine, called from usb.c
 */
@@ -2088,8 +2057,7 @@ int ohci_usb_lowlevel_init(int32_t handle, const struct pci_device_id *ent, void

 	info("ohci %p", ohci);

-	ohci->controller = PCI_FUNCTION_FROM_HANDLE(ohci->handle);
-	// ohci->controller = (ohci->handle >> 16) & 3; /* PCI function */
+	ohci->controller = (ohci->handle >> 16) & 3; /* PCI function */

 	/* this must be aligned to a 256 byte boundary */
 	ohci->hcca_unaligned = (struct ohci_hcca *) driver_mem_alloc(sizeof(struct ohci_hcca) + 256);
@@ -2124,7 +2092,7 @@ int ohci_usb_lowlevel_init(int32_t handle, const struct pci_device_id *ent, void
 	
 	ptd = (struct td *) (((uint32_t) ohci->td_unaligned + 7) & ~7);

-	dbg("memset from %p to %p\r\n", ptd, ptd + sizeof(td_t) * NUM_TD);
+	debug_printf("memset from %p to %p\r\n", ptd, ptd + sizeof(td_t) * NUM_TD);
 	memset(ptd, 0, sizeof(td_t) * NUM_TD);
 	info("aligned TDs %p", ptd);

@@ -2137,22 +2105,12 @@ int ohci_usb_lowlevel_init(int32_t handle, const struct pci_device_id *ent, void
 		unsigned short flags;
 		do
 		{
-			dbg("\r\nPCI USB descriptors (at %p): flags 0x%04x start 0x%08lx \r\n offset 0x%08lx dmaoffset 0x%08lx length 0x%08lx\r\n",
-				pci_rsc_desc,
-				pci_rsc_desc->flags,
-				pci_rsc_desc->start,
-				pci_rsc_desc->offset,
-				pci_rsc_desc->dmaoffset,
-				pci_rsc_desc->length);
-
+			debug_printf("\r\nPCI USB descriptors (at %p): flags 0x%04x start 0x%08lx \r\n offset 0x%08lx dmaoffset 0x%08lx length 0x%08lx\r\n", pci_rsc_desc,
+					pci_rsc_desc->flags, pci_rsc_desc->start, pci_rsc_desc->offset, pci_rsc_desc->dmaoffset, pci_rsc_desc->length);
 			if (!(pci_rsc_desc->flags & FLG_IO))
 			{
-				/* if this is a memory-mapped resource */
-
 				if (usb_base_addr == 0xFFFFFFFF)
 				{
-					/* and if its not initialized yet */
-
 					usb_base_addr = pci_rsc_desc->start;
 					ohci->offset = pci_rsc_desc->offset;
 					ohci->regs = (void *)(pci_rsc_desc->offset + pci_rsc_desc->start);
@@ -2162,7 +2120,7 @@ int ohci_usb_lowlevel_init(int32_t handle, const struct pci_device_id *ent, void
 					if ((pci_rsc_desc->flags & FLG_ENDMASK) == ORD_MOTOROLA)
 						ohci->big_endian = 0; /* host bridge make swapping intel -> motorola */
 					else
-						ohci->big_endian = 1; /* driver must do swapping intel -> motorola */
+						ohci->big_endian = 1; /* driver must swapping intel -> motorola */
 				}
 			}
 			flags = pci_rsc_desc->flags;
@@ -2173,15 +2131,14 @@ int ohci_usb_lowlevel_init(int32_t handle, const struct pci_device_id *ent, void
 	else
 	{
 		hc_free_buffers(ohci);
-		dbg("pci_get_resource() failed\r\n");
-
-		return -1; /* get_resource error */
+		debug_printf("pci_get_resource() failed in %s %s\r\n", __FILE__, __LINE__);
+		return(-1); /* get_resource error */
 	}

 	if (usb_base_addr == 0xFFFFFFFF)
 	{
 		hc_free_buffers(ohci);
-		return -1;
+		return(-1);
 	}

 	if (handle && (ent != NULL))
@@ -2189,36 +2146,20 @@ int ohci_usb_lowlevel_init(int32_t handle, const struct pci_device_id *ent, void
 		ohci->flags = 0;
 		switch (ent->vendor)
 		{
-			case PCI_VENDOR_ID_AL:
-				ohci->slot_name = "uli1575";
-				break;
-
-			case PCI_VENDOR_ID_NEC:
-				ohci->slot_name = "uPD720101";
-				ohci->flags |= OHCI_FLAGS_NEC;
-				break;
-
-			case PCI_VENDOR_ID_PHILIPS:
-				ohci->slot_name = "isp1561";
-				break;
-
-			default:
-				ohci->slot_name = "generic";
-				break;
+			case PCI_VENDOR_ID_AL: ohci->slot_name = "uli1575"; break;
+			case PCI_VENDOR_ID_NEC: ohci->slot_name = "uPD720101"; ohci->flags |= OHCI_FLAGS_NEC; break;
+			case PCI_VENDOR_ID_PHILIPS: ohci->slot_name = "isp1561"; break;
+			default: ohci->slot_name = "generic"; break;
 		}
 	}

-	dbg("OHCI usb-%s-%c, regs address 0x%08X, PCI handle 0x%X\r\n",
-		ohci->slot_name,
-		(char) ohci->controller + '0',
-		ohci->regs, handle);
-
+	debug_printf("OHCI usb-%s-%c, regs address 0x%08X, PCI handle 0x%X\r\n", ohci->slot_name, (char)ohci->controller + '0', ohci->regs, handle);
 	if (hc_reset(ohci) < 0)
 	{
 		err("Can't reset OHCI usb-%s-%c", ohci->slot_name, (char)ohci->controller + '0');
 		hc_release_ohci(ohci);
 		hc_free_buffers(ohci);
-		return -1;
+		return(-1);
 	}

 	if (hc_start(ohci) < 0)
@@ -2226,32 +2167,28 @@ int ohci_usb_lowlevel_init(int32_t handle, const struct pci_device_id *ent, void
 		err("Can't start OHCI usb-%s-%c", ohci->slot_name, (char)ohci->controller + '0');
 		hc_release_ohci(ohci);
 		hc_free_buffers(ohci);
-
 		/* Initialization failed */
-		return -1;
+		return(-1);
 	}

-#ifdef DEBUG_OHCI
+#ifdef DEBUG
 	ohci_dump(ohci, 1);
 #endif
 	pci_hook_interrupt(handle, handle_usb_interrupt, ohci);
 	if (priv != NULL)
 		*priv = (void *)ohci;
-
 	ohci_inited = 1;
-
-	return 0;
+	return(0);
 }

 int ohci_usb_lowlevel_stop(void *priv)
 {
 	/* this gets called really early - before the controller has */
 	/* even been initialized! */
-
 	ohci_t *ohci = (ohci_t *)priv;

 	if (!ohci_inited)
-		return 0;
+		return(0);

 	if (ohci == NULL)
 		ohci = &gohci[0];
@@ -2260,12 +2197,9 @@ int ohci_usb_lowlevel_stop(void *priv)

 	hc_reset(ohci);
 	hc_free_buffers(ohci);
-
 	/* This driver is no longer initialised. It needs a new low-level
 	 * init (board/cpu) before it can be used again. */
-
 	ohci_inited = 0;
-
-	return 0;
+	return(0);
 }

--- a/pci/pci.c
+++ b/pci/pci.c
@@ -26,7 +26,7 @@

 #include <MCF5475.h>
 #include "pci.h"
-#include "bas_types.h"
+#include "stdint.h"
 #include "bas_printf.h"
 #include "bas_string.h"
 #include "util.h"
@@ -35,7 +35,7 @@

 //#define DEBUG_PCI
 #ifdef DEBUG_PCI
-#define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
+#define dbg(format, arg...) do { xprintf("DEBUG: " format "", ##arg); } while (0)
 #else
 #define dbg(format, arg...) do { ; } while (0)
 #endif /* DEBUG_PCI */
@@ -147,13 +147,6 @@ __attribute__((interrupt)) void pci_interrupt(void)
 	dbg("PCI interrupt\r\n");
 }

-/*
- * Although this pragma stuff should work according to the GCC docs, it doesn't seem to
- * with m68k-atari-mint-gcc. At least not currently.
- * I nevertheless keep it here for future reference
- */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
 static int32_t pci_get_interrupt_cause(int32_t *handles)
 {
 	int32_t handle;
@@ -169,7 +162,7 @@ static int32_t pci_get_interrupt_cause(int32_t *handles)
 			return handle;
 		}
 	}
-	dbg("%s: no interrupt cause found\r\n");
+	dbg("%s: no interrupt cause found\r\n", __FUNCTION__);
 	return -1;
 }

@@ -177,7 +170,6 @@ static int32_t pci_call_interrupt_chain(int32_t handle, int32_t data)
 {
 	return data;	/* unmodified - means: not handled */
 }
-#pragma GCC diagnostic pop

 #ifdef MACHINE_M5484LITE
 /*
@@ -187,7 +179,7 @@ static int32_t pci_call_interrupt_chain(int32_t handle, int32_t data)
 void irq5_handler(void)
 {
 	int32_t handle;
-	int32_t value = 0;
+	int32_t value;
 	int32_t newvalue;

 	MCF_EPORT_EPFR |= (1 << 5);		/* clear interrupt from edge port */
@@ -197,7 +189,7 @@ void irq5_handler(void)
 		newvalue = pci_call_interrupt_chain(handle, value);
 		if (newvalue == value)
 		{
-			dbg("%s: interrupt not handled!\r\n");
+			dbg("%s: interrupt not handled!\r\n", __FUNCTION__);
 		}
 	}
 }
@@ -209,7 +201,7 @@ void irq5_handler(void)
 void irq7_handler(void)
 {
 	int32_t handle;
-	int32_t value = 0;
+	int32_t value;
 	int32_t newvalue;

 	MCF_EPORT_EPFR |= (1 << 7);
@@ -219,7 +211,7 @@ void irq7_handler(void)
 		newvalue = pci_call_interrupt_chain(handle, value);
 		if (newvalue == value)
 		{
-			dbg("%s: interrupt not handled!\r\n");
+			dbg("%s: interrupt not handled!\r\n", __FUNCTION__);
 		}
 	}
 }
@@ -448,7 +440,7 @@ int32_t pci_find_device(uint16_t device_id, uint16_t vendor_id, int index)
 	uint16_t n = 0;
 	int32_t handle;

-	for (bus = 0; bus < 1; bus++)
+	for (bus = 0; bus < 2; bus++)
 	{
 		for (device = 10; device < 31; device++)
 		{
@@ -595,168 +587,7 @@ int32_t pci_unhook_interrupt(int32_t handle)
 	return PCI_SUCCESSFUL;
 }

-/*
- * Not implemented PCI_BIOS functions
- */

-uint8_t pci_fast_read_config_byte(int32_t handle, uint16_t reg)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-uint16_t pci_fast_read_config_word(int32_t handle, uint16_t reg)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-uint32_t pci_fast_read_config_longword(int32_t handle, uint16_t reg)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_special_cycle(uint16_t bus, uint32_t data)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_get_routing(int32_t handle)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_set_interrupt(int32_t handle)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_get_card_used(int32_t handle, uint32_t *address)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_set_card_used(int32_t handle, uint32_t *callback)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_read_mem_byte(int32_t handle, uint32_t offset, uint8_t *address)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_read_mem_word(int32_t handle, uint32_t offset, uint16_t *address)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_read_mem_longword(int32_t handle, uint32_t offset, uint32_t *address)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-uint8_t pci_fast_read_mem_byte(int32_t handle, uint32_t offset)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-uint16_t pci_fast_read_mem_word(int32_t handle, uint32_t offset)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-uint32_t pci_fast_read_mem_longword(int32_t handle, uint32_t offset)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_write_mem_byte(int32_t handle, uint32_t offset, uint16_t val)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_write_mem_word(int32_t handle, uint32_t offset, uint16_t val)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_write_mem_longword(int32_t handle, uint32_t offset, uint32_t val)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_read_io_byte(int32_t handle, uint32_t offset, uint8_t *address)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_read_io_word(int32_t handle, uint32_t offset, uint16_t *address)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_read_io_longword(int32_t handle, uint32_t offset, uint32_t *address)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-uint8_t pci_fast_read_io_byte(int32_t handle, uint32_t offset)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-uint16_t pci_fast_read_io_word(int32_t handle, uint32_t offset)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-uint32_t pci_fast_read_io_longword(int32_t handle, uint32_t offset)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_write_io_byte(int32_t handle, uint32_t offset, uint16_t val)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_write_io_word(int32_t handle, uint32_t offset, uint16_t val)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_write_io_longword(int32_t handle, uint32_t offset, uint32_t val)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_get_machine_id(void)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_get_pagesize(void)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_virt_to_bus(int32_t handle, uint32_t address, PCI_CONV_ADR *pointer)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-int32_t pci_bus_to_virt(int32_t handle, uint32_t address, PCI_CONV_ADR *pointer)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_virt_to_phys(uint32_t address, PCI_CONV_ADR *pointer)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}
-
-int32_t pci_phys_to_virt(uint32_t address, PCI_CONV_ADR *pointer)
-{
-	return PCI_FUNC_NOT_SUPPORTED;
-}

 /*
 * pci_device_config()
@@ -776,12 +607,6 @@ static void pci_device_config(uint16_t bus, uint16_t device, uint16_t function)
 	static uint32_t io_address = PCI_IO_OFFSET;
 	uint16_t cr;

-	/*
-	 * should make compiler happy (these are used only in debug builds)
-	 */
-	(void) value;
-	(void) il;
-
 	/* determine pci handle from bus, device + function number */
 	handle = PCI_HANDLE(bus, device, function);

@@ -824,7 +649,7 @@ static void pci_device_config(uint16_t bus, uint16_t device, uint16_t function)
 			 */
 			struct pci_rd *rd = &descriptors[barnum]; 

-			dbg("%s: address = %08x\r\n", address);
+			dbg("%s: address = %08x\r\n", __FUNCTION__, address);
 			if (IS_PCI_MEM_BAR(address))
 			{
 				/* adjust base address to card's alignment requirements */
@@ -913,10 +738,10 @@ static void pci_device_config(uint16_t bus, uint16_t device, uint16_t function)

 		/* write it to PCIERBAR and enable ROM */
 		pci_write_config_longword(handle, PCIERBAR, swpl(address | 1));
-		dbg("%s: set PCIERBAR on device 0x%02x to 0x%08x\r\n", handle, address | 1);
+		dbg("%s: set PCIERBAR on device 0x%02x to 0x%08x\r\n", __FUNCTION__, handle, address | 1);

 		/* read value back just to be sure */
-		dbg("%s: PCIERBAR = %p\r\n", swpl(pci_read_config_longword(handle, PCIERBAR)));
+		dbg("%s: PCIERBAR = %p\r\n", __FUNCTION__, swpl(pci_read_config_longword(handle, PCIERBAR)));


 		rd->next = sizeof(struct pci_rd);
--- a/pci/pci_wrappers.S
+++ b/pci/pci_wrappers.S
@@ -1,469 +0,0 @@
-/*
- * pci.S
- *
- * Purpose:		PCI configuration for the Coldfire builtin PCI bridge.
- *
- * Notes:
- *
- * This file is part of BaS_gcc.
- *
- * BaS_gcc 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.
- *
- * BaS_gcc 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 BaS_gcc.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Created on: 08.05.2014
- *      Author: David Galvez
- */
-
-.global _wrapper_find_pci_device
-.global _wrapper_find_pci_classcode
-
-.global _wrapper_read_config_longword
-.global _wrapper_read_config_word
-.global _wrapper_read_config_byte
-
-.global _wrapper_fast_read_config_byte
-.global _wrapper_fast_read_config_word
-.global _wrapper_fast_read_config_longword
-
-.global _wrapper_write_config_longword
-.global _wrapper_write_config_word
-.global _wrapper_write_config_byte
-
-.global _wrapper_get_resource
-.global _wrapper_hook_interrupt
-.global _wrapper_unhook_interrupt
-
-.global _wrapper_special_cycle
-.global _wrapper_get_routing
-.global _wrapper_set_interrupt
-.global _wrapper_get_resource
-.global _wrapper_get_card_used
-.global _wrapper_set_card_used
-
-.global _wrapper_read_mem_byte
-.global _wrapper_read_mem_word
-.global _wrapper_read_mem_longword
-
-.global _wrapper_fast_read_mem_byte
-.global _wrapper_fast_read_mem_word
-.global _wrapper_fast_read_mem_longword
-
-.global _wrapper_write_mem_byte
-.global _wrapper_write_mem_word
-.global _wrapper_write_mem_longword
-
-.global _wrapper_read_io_byte
-.global _wrapper_read_io_word
-.global _wrapper_read_io_longword
-
-.global _wrapper_fast_read_io_byte
-.global _wrapper_fast_read_io_word
-.global _wrapper_fast_read_io_longword
-
-.global _wrapper_write_io_byte
-.global _wrapper_write_io_word
-.global _wrapper_write_io_longword
-
-.global _wrapper_get_machine_id
-.global _wrapper_get_pagesize
-
-.global _wrapper_virt_to_bus
-.global _wrapper_bus_to_virt
-.global _wrapper_virt_to_phys
-.global _wrapper_phys_to_virt
-
-
-_wrapper_find_pci_device:
-	move.l D1,-(SP)			// index
-	move.l D0,-(SP)			// Vendor ID
-	move.l #16,D1
-	lsr.l D1,D0
-	move.l D0,-(SP)			// Device ID
-	jsr _pci_find_device
-	add.l #12,SP
-	rts
-
-_wrapper_find_pci_classcode:
-	move.l D1,-(SP)			// index
-	move.l D0,-(SP)			// ID
-	jsr _pci_find_classcode
-	addq.l #8,SP
-	rts
-
-_wrapper_read_config_byte:
-	move.l A0,-(SP)			// pointer to space for read data
-	move.l D1,-(SP)			// PCI register
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_config_byte
-	move.l 8(SP),A0			// PCI_BIOS expects value in memory
-	move.l D0,(A0)
-	add.l #12,SP
-	move.l #0,D0
-	rts
-
-_wrapper_read_config_word:
-	move.l A0,-(SP)			// pointer to space for read data
-	move.l D1,-(SP)			// PCI register
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_config_word
-	move.l 8(SP),A0			// little to big endian
-	move.l D0,(A0)
-	mvz.b 1(A0),D0
-	lsl.l #8,D0
-	move.b (A0),D0
-	move.l D0,(A0)			// PCI_BIOS expects value in memory, not in D0
-	add.l #12,SP
-	move.l #0,D0
-	rts
-
-_wrapper_read_config_longword:
-	move.l A0,-(SP)			// pointer to space for read data
-	move.l D1,-(SP)			// PCI register
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_config_longword
-	move.l 8(SP),A0			// little to big endian
-	move.l D0,(A0)
-	mvz.b 3(A0),D0
-	lsl.l #8,D0
-	move.b 2(A0),D0
-	lsl.l #8,D0
-	move.b 1(A0),D0
-	lsl.l #8,D0
-	move.b (A0),D0
-	move.l D0,(A0)			// PCI_BIOS expects value in memory, not in D0
-	add.l #12,SP
-	move.l #0,D0
-	rts
-
-/* Not implemented */
-_wrapper_fast_read_config_byte:
-	move.l D1,-(SP)			// PCI register
-	move.l D0,-(SP)			// handle
-	jsr _pci_fast_read_config_byte
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_fast_read_config_word:
-	move.l D1,-(SP)			// PCI register
-	move.l D0,-(SP)			// handle
-	jsr _pci_fast_read_config_word
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_fast_read_config_longword:
-	move.l D1,-(SP)			// PCI register
-	move.l D0,-(SP)			// handle
-	jsr _pci_fast_read_config_longword
-	addq.l #8,SP
-	rts
-
-_wrapper_write_config_byte:
-	move.l D2,-(SP)			// data to write
-	move.l D1,-(SP)			// PCI register
-	move.l D0,-(SP)			// handle
-	jsr _pci_write_config_byte
-	add.l #12,SP
-	rts
-
-_wrapper_write_config_word:
-	move.l D0,-(SP)			// make data little endian
-	moveq #0,D1
-	move.w D2,D1
-	lsr.l #8,D1
-	asl.l #8,D2
-	or.l D1,D2
-	move.l (SP)+,D0
-	move.l D2,-(SP)			// data to write
-	move.l D1,-(SP)			// PCI register
-	move.l D0,-(SP)			// handle
-	jsr _pci_write_config_word
-	add.l #12,SP
-	rts
-
-_wrapper_write_config_longword:
-	move.l D0,-(SP)
-	move.l D2,D0			// make data little endian
-	lsr.l #8,D0
-	asl.l #8,D2
-	and.l #0x00FF00FF,D0
-	and.l #0xFF00FF00,D2
-	or.l D0,D2
-	swap D2
-	move.l (SP)+,D0
-	move.l D2,-(SP)			// data to write
-	move.l D1,-(SP)			// PCI register
-	move.l D0,-(SP)			// handle
-	jsr _pci_write_config_longword
-	add.l #12,SP
-	rts
-
-_wrapper_hook_interrupt:
-	move.l A1,-(SP)			// parameter for interrupt handler
-	move.l A0,-(SP)			// pointer to interrupt handler
-	move.l D0,-(SP)			// handle
-	jsr _pci_hook_interrupt
-	add.l #12,SP
-	rts
-
-_wrapper_unhook_interrupt:
-	move.l D0,-(SP)			// handle
-	jsr _pci_unhook_interrupt
-	addq.l #4,SP
-	rts
-
-/* Not implemented */
-_wrapper_special_cycle:
-	move.l D1,-(SP)			// special cycle data
-	move.l D0,-(SP)			// bus number
-	jsr _pci_special_cycle
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_get_routing:
-	move.l D0,-(SP)			// handle
-	jsr _pci_get_routing
-	addq.l #4,SP
-	rts
-
-/* Not implemented */
-_wrapper_set_interrupt:
-	move.l D1,-(SP)			// mode
-	move.l D0,-(SP)			// handle
-	jsr _pci_set_interrupt
-	addq.l #8,SP
-	rts
-
-_wrapper_get_resource:
-	move.l D0,-(SP)			// handle
-	jsr _pci_get_resource
-	addq.l #4,SP
-	rts
-
-/* Not implemented */
-_wrapper_get_card_used:
-	move.l D1,-(SP)			// address
-	move.l D0,-(SP)			// handle
-	jsr _pci_get_card_used
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_set_card_used:
-	move.l A0,-(SP)			// callback
-	move.l D0,-(SP)			// handle
-	jsr _pci_set_card_used
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_read_mem_byte:
-	move.l A0,-(SP)			// pointer to data in memory
-	move.l D1,-(SP)			// address to access (in PCI memory address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_mem_byte
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_read_mem_word:
-	move.l A0,-(SP)			// pointer to data in memory
-	move.l D1,-(SP)			// address to access (in PCI memory address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_mem_word
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_read_mem_longword:
-	move.l A0,-(SP)			// pointer to data in memory
-	move.l D1,-(SP)			// address to access (in PCI memory address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_mem_longword
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_fast_read_mem_byte:
-	move.l D1,-(SP)			// address to access (in PCI memory address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_mem_byte
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_fast_read_mem_word:
-	move.l D1,-(SP)			// address to access (in PCI memory address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_mem_word
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_fast_read_mem_longword:
-	move.l D1,-(SP)			// address to access (in PCI memory address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_mem_longword
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_write_mem_byte:
-	move.l D2,-(SP)			// data to write
-	move.l D1,-(SP)			// address to access (in PCI memory address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_write_mem_byte
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_write_mem_word:
-	move.l D2,-(SP)			// data to write
-	move.l D1,-(SP)			// address to access (in PCI memory address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_write_mem_word
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_write_mem_longword:
-	move.l D2,-(SP)			// data to write
-	move.l D1,-(SP)			// address to access (in PCI memory address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_write_mem_longword
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_read_io_byte:
-	move.l A0,-(SP)			// pointer to data in memory
-	move.l D1,-(SP)			// address to access (in PCI I/O address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_io_byte
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_read_io_word:
-	move.l A0,-(SP)			// pointer to data in memory
-	move.l D1,-(SP)			// address to access (in PCI I/O address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_io_word
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_read_io_longword:
-	move.l A0,-(SP)			// pointer to data in memory
-	move.l D1,-(SP)			// address to access (in PCI I/O address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_io_longword
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_fast_read_io_byte:
-	move.l D1,-(SP)			// address to access (in PCI I/O address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_io_byte
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_fast_read_io_word:
-	move.l D1,-(SP)			// address to access (in PCI I/O address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_io_word
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_fast_read_io_longword:
-	move.l D1,-(SP)			// address to access (in PCI I/O address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_read_io_longword
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_write_io_byte:
-	move.l D2,-(SP)			// data to write
-	move.l D1,-(SP)			// address to access (in PCI I/O address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_write_io_byte
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_write_io_word:
-	move.l D2,-(SP)			// data to write
-	move.l D1,-(SP)			// address to access (in PCI I/O address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_write_io_word
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_write_io_longword:
-	move.l D2,-(SP)			// data to write
-	move.l D1,-(SP)			// address to access (in PCI I/O address space)
-	move.l D0,-(SP)			// handle
-	jsr _pci_write_io_longword
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_get_machine_id:
-	jsr _pci_get_machine_id
-	rts
-
-/* Not implemented */
-_wrapper_get_pagesize:
-	jsr _pci_get_pagesize
-	rts
-
-/* Not implemented */
-_wrapper_virt_to_bus:
-	move.l A0,-(SP)			// ptr
-	move.l D1,-(SP)			// address in virtual CPU space
-	move.l D0,-(SP)			// handle
-	jsr _pci_virt_to_bus
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_bus_to_virt:
-	move.l A0,-(SP)			// ptr
-	move.l D1,-(SP)			// PCI bus address
-	move.l D0,-(SP)			// handle
-	jsr _pci_bus_to_virt
-	add.l #12,SP
-	rts
-
-/* Not implemented */
-_wrapper_virt_to_phys:
-	move.l A0,-(SP)			// ptr
-	move.l D0,-(SP)			// address in virtual CPU space
-	jsr _pci_virt_to_phys
-	addq.l #8,SP
-	rts
-
-/* Not implemented */
-_wrapper_phys_to_virt:
-	move.l A0,-(SP)			// ptr
-	move.l D0,-(SP)			// physical CPU address 
-	jsr _pci_phys_to_virt
-	addq.l #8,SP
-	rts
--- a/radeon/radeon_cursor.c
+++ b/radeon/radeon_cursor.c
@@ -44,13 +44,11 @@
 *
 */

-#include "bas_types.h"
-#include "bas_printf.h"
 #include "radeonfb.h"

 #define DBG_RADEON
 #ifdef DBG_RADEON
-#define dbg(format, arg...) do { xprintf("DEBUG %s(): " format, __FUNCTION__, ##arg); } while (0)
+#define dbg(format, arg...) do { xprintf("DEBUG: " format, ##arg); } while (0)
 #else
 #define dbg(format, arg...) do { ; } while (0)
 #endif /* DBG_RADEON */
@@ -93,9 +91,7 @@ void radeon_set_cursor_colors(struct fb_info *info, int bg, int fg)
 	if(fg == rinfo->cursor_fg && bg == rinfo->cursor_bg)
 		return;
 	CURSOR_SWAPPING_START();
-
-    /*
-     * Note: We assume that the pixels are either fully opaque or fully
+	/* Note: We assume that the pixels are either fully opaque or fully
 	 * transparent, so we won't premultiply them, and we can just
 	 * check for non-zero pixel values; those are either fg or bg
 	 */
@@ -122,12 +118,10 @@ void radeon_set_cursor_position(struct fb_info *info, int x, int y)
 		xorigin = 1 - x;
 	if(y < 0)
 	  yorigin = 1 - y;
-
 //	DPRINTVALHEX("radeonfb: RADEONSetCursorPosition: cursor_start ",rinfo->cursor_start);
 //	DPRINTVAL(" x ",x);
 //	DPRINTVAL(" y ",y);
 //	DPRINT("\r\n");
-
 	OUTREG(CUR_HORZ_VERT_OFF, (CUR_LOCK  | (xorigin << 16) | yorigin));
 	OUTREG(CUR_HORZ_VERT_POSN, (CUR_LOCK | ((xorigin ? 0 : x) << 16) | (yorigin ? 0 : y)));
 	OUTREG(CUR_OFFSET, rinfo->cursor_start + yorigin * 256);
@@ -138,8 +132,7 @@ void radeon_set_cursor_position(struct fb_info *info, int x, int y)
 		rinfo->cursor_y = (unsigned long)y;
 }

-/*
- * Copy cursor image from `image' to video memory.  RADEONSetCursorPosition
+/* Copy cursor image from `image' to video memory.  RADEONSetCursorPosition
 * will be called after this, so we can ignore xorigin and yorigin.
 */
 void radeon_load_cursor_image(struct fb_info *info, unsigned short *mask, unsigned short *data, int zoom)
@@ -150,14 +143,11 @@ void radeon_load_cursor_image(struct fb_info *info, unsigned short *mask, unsign
 	unsigned short chunk, mchunk;
 	unsigned long i, j, k;
 	CURSOR_SWAPPING_DECL
-
 //	DPRINTVALHEX("radeonfb: RADEONLoadCursorImage: cursor_start ",rinfo->cursor_start);
 //	DPRINT("\r\n");	
-
 	save = INREG(CRTC_GEN_CNTL) & ~(unsigned long) (3 << 20);
 	save |= (unsigned long) (2 << 20);
 	OUTREG(CRTC_GEN_CNTL, save & (unsigned long)~CRTC_CUR_EN);
-
 	/*
 	 * Convert the bitmap to ARGB32.
 	 */
@@ -292,7 +282,6 @@ void radeon_load_cursor_image(struct fb_info *info, unsigned short *mask, unsign
 void radeon_hide_cursor(struct fb_info *info)
 {
 	struct radeonfb_info *rinfo = info->par;
-
 //	DPRINT("radeonfb: RADEONHideCursor\r\n");
 	OUTREGP(CRTC_GEN_CNTL, 0, ~CRTC_CUR_EN);
 	rinfo->cursor_show = 0;
@@ -302,7 +291,6 @@ void radeon_hide_cursor(struct fb_info *info)
 void radeon_show_cursor(struct fb_info *info)
 {
 	struct radeonfb_info *rinfo = info->par;
-
 //	DPRINT("radeonfb: RADEONShowCursor\r\n");
 	OUTREGP(CRTC_GEN_CNTL, CRTC_CUR_EN, ~CRTC_CUR_EN);
 	rinfo->cursor_show = 1;
@@ -315,7 +303,7 @@ long radeon_cursor_init(struct fb_info *info)
 	int size_bytes = CURSOR_WIDTH * 4 * CURSOR_HEIGHT;
 	unsigned long fbarea = offscreen_alloc(rinfo->info, size_bytes + 256);

-    dbg("radeonfb: %s: fbarea: %p\r\n", fbarea);
+	dbg("radeonfb: %s: fbarea: %p\r\n", __FUNCTION__, fbarea);

 	if(!fbarea)
 		rinfo->cursor_start = 0;
--- a/spi/dspi.c
+++ b/spi/dspi.c
@@ -25,6 +25,7 @@
 *      Author: mfro
 */

+#include <stdint.h>
 #include <bas_types.h>
 #include <MCF5475.h>

@@ -35,7 +36,7 @@ struct baudrate
 	int	divider;
 };

-static const int system_clock = 132000000;	/* System clock in Hz */
+static const int system_clock = 133000000;	/* System clock in Hz */

 struct baudrate baudrates[] =
 {
--- a/spi/mmc.c
+++ b/spi/mmc.c
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <bas_types.h>
 #include <sd_card.h>
 #include <bas_printf.h>
--- a/sys/BaS.c
+++ b/sys/BaS.c
@@ -21,7 +21,8 @@
 * Copyright 2012        M. Froeschle
 */

-#include <bas_types.h>
+#include <stdint.h>
+#include <stdbool.h>

 #include "MCF5475.h"
 #include "startcf.h"
@@ -51,7 +52,7 @@

 //#define BAS_DEBUG
 #if defined(BAS_DEBUG)
-#define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
+#define dbg(format, arg...) do { xprintf("DEBUG: " format "\r\n", ##arg); } while (0)
 #else
 #define dbg(format, arg...) do { ; } while (0)
 #endif
@@ -131,7 +132,7 @@ void pic_init(void)

 	if (answer[0] != 'O' || answer[1] != 'K' || answer[2] != '!')
 	{
-        dbg("PIC initialization failed. Already initialized?\r\n");
+		dbg("%s: PIC initialization failed. Already initialized?\r\n", __FUNCTION__);
 	}
 	else
 	{
@@ -202,12 +203,12 @@ void acia_init()
 void enable_coldfire_interrupts()
 {
 	xprintf("enable interrupts: ");
-#if defined(MACHINE_FIREBEE)
+#if MACHINE_FIREBEE
 	*FPGA_INTR_CONTRL = 0L;				/* disable all interrupts */
 #endif /* MACHINE_FIREBEE */
 	MCF_EPORT_EPPAR = 0xaaa8;			/* all interrupts on falling edge */

-#if defined(MACHINE_FIREBEE)
+#if MACHINE_FIREBEE
 	/*
 	 * TIN0 on the Coldfire is connected to the FPGA. TIN0 triggers every write
 	 * access to 0xff8201 (vbasehi), i.e. everytime the video base address is written
@@ -230,10 +231,9 @@ void enable_coldfire_interrupts()

 void disable_coldfire_interrupts()
 {
-#if defined(MACHINE_FIREBEE)
+#ifdef MACHINE_FIREBEE
 	*FPGA_INTR_ENABLE = 0;		/* disable all interrupts */
 #endif /* MACHINE_FIREBEE */
-
 	MCF_EPORT_EPIER = 0x0;
 	MCF_EPORT_EPFR = 0x0;
 	MCF_INTC_IMRL = 0xfffffffe;
@@ -243,46 +243,75 @@ void disable_coldfire_interrupts()


 NIF nif1;
-#if defined(MACHINE_M5484LITE)
+#ifdef MACHINE_M5484LITE
 NIF nif2;
 #endif
+static IP_INFO ip_info;
+static ARP_INFO	arp_info;

-/*
- * initialize the interrupt handler tables to dispatch interrupt requests from Coldfire devices
- */
-void init_isr(void)
+
+void network_init(void)
 {
+	uint8_t mac[6] = {0x00, 0xcf, 0x54, 0x85, 0xcf, 0x01};	/* this is the original MAC address dbug assigns */
+	uint8_t bc[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; /* this is our broadcast MAC address */
+	IP_ADDR myip = {192, 168, 1, 100};
+	IP_ADDR gateway = {192, 168, 1, 1};
+	IP_ADDR netmask = {255, 255, 255, 0};
+	int vector;
+	int (*handler)(void *, void *);
+
+	handler = fec0_interrupt_handler;
+	vector = 103;
+
 	isr_init();		/* need to call that explicitely, otherwise isr table might be full */

-    /*
-     * register the FEC interrupt handler
-     */
-    if (!isr_register_handler(64 + INT_SOURCE_FEC0, fec0_interrupt_handler, NULL, (void *) &nif1))
+	if (!isr_register_handler(vector, handler, NULL, (void *) &nif1))
 	{
-        dbg("unable to register isr for FEC0\r\n");
+		dbg("%s: unable to register handler for vector %d\r\n", __FUNCTION__, vector);
 		return;
 	}

    /*
     * Register the DMA interrupt handler
     */
+    handler = dma_interrupt_handler;
+    vector = 112;

-    if (!isr_register_handler(64 + INT_SOURCE_DMA, dma_interrupt_handler, NULL,NULL))
+    if (!isr_register_handler(vector, handler, NULL,NULL))
 	{
-        dbg("Error: Unable to register isr for DMA\r\n");
+		dbg("%s: Error: Unable to register handler for vector %s\r\n", __FUNCTION__, vector);
 		return;
 	}

-    dma_irq_enable(5, 3);	/* TODO: need to match the FEC driver's specs in MiNT? */
+	nif_init(&nif1);
+	nif1.mtu = ETH_MTU;
+	nif1.send = fec0_send;
+	fec_eth_setup(0, FEC_MODE_MII, FEC_MII_100BASE_TX, FEC_MII_FULL_DUPLEX, mac);
+	// fec_eth_setup(1, FEC_MODE_MII, FEC_MII_100BASE_TX, FEC_MII_FULL_DUPLEX, mac);
+	memcpy(nif1.hwa, mac, 6);
+	memcpy(nif1.broadcast, bc, 6);

-    /*
-     * register the PIC interrupt handler
-     */
-    if (isr_register_handler(64 + INT_SOURCE_PSC3, pic_interrupt_handler, NULL, NULL))
-    {
-        dbg("Error: unable to register ISR for PSC3\r\n");
-        return;
-    }
+	dbg("%s: ethernet address is %02X:%02X:%02X:%02X:%02X:%02X\r\n", __FUNCTION__, 
+				nif1.hwa[0], nif1.hwa[1], nif1.hwa[2],
+				nif1.hwa[3], nif1.hwa[4], nif1.hwa[5]);
+	
+	timer_init(TIMER_NETWORK, TMR_INTC_LVL, TMR_INTC_PRI);
+
+	arp_init(&arp_info);
+	nif_bind_protocol(&nif1, ETH_FRM_ARP, arp_handler, (void *) &arp_info);
+
+	ip_init(&ip_info, myip, gateway, netmask);
+	nif_bind_protocol(&nif1, ETH_FRM_IP, ip_handler, (void *) &ip_info);
+
+	udp_init();
+
+	dma_irq_enable(6, 6);
+
+	set_ipl(0);
+
+	bootp_request(&nif1, 0);
+
+	fec_eth_stop(0);
 }

 void BaS(void)
@@ -290,7 +319,7 @@ void BaS(void)
 	uint8_t *src;
 	uint8_t *dst = (uint8_t *) TOS;

-#if defined(MACHINE_FIREBEE)        /* LITE board has no pic and (currently) no nvram */
+#if MACHINE_FIREBEE	/* LITE board has no pic and (currently) no nvram */
 	pic_init();
 	nvram_init();
 #endif /* MACHINE_FIREBEE */
@@ -306,12 +335,6 @@ void BaS(void)
 	mmu_init();
 	xprintf("finished\r\n");

-    xprintf("enable MMU: ");
-
-    mmu_enable();										/* force pipeline sync */
-
-    xprintf("finished\r\n");
-
 	xprintf("initialize exception vector table: ");
 	vec_init();
 	xprintf("finished\r\n");
@@ -319,6 +342,10 @@ void BaS(void)
 	xprintf("flush caches: ");
 	flush_and_invalidate_caches();
 	xprintf("finished\r\n");
+	xprintf("enable MMU: ");
+	MCF_MMU_MMUCR = MCF_MMU_MMUCR_EN;			/* MMU on */
+	NOP();										/* force pipeline sync */
+	xprintf("finished\r\n");
 	
 	#ifdef MACHINE_FIREBEE
 	xprintf("IDE reset: ");
@@ -388,7 +415,7 @@ void BaS(void)
 	 */
 	memset((void *) 0x400, 0, 0x400);

-#if defined(MACHINE_FIREBEE)
+#ifdef MACHINE_FIREBEE
 	/* set Falcon bus control register */
 	/* sets bit 3 and 6. Both are undefined on an original Falcon? */

@@ -407,7 +434,7 @@ void BaS(void)
 	* (uint32_t *) 0x5a4 = FASTRAM_END;	/* ramtop TOS system variable */
 	* (uint32_t *) 0x5a8 = 0x1357bd13;	/* ramvalid TOS system variable */

-#if defined(MACHINE_FIREBEE) /* m5484lite has no ACIA and no dip switch... */
+#ifdef MACHINE_FIREBEE /* m5484lite has no ACIA and no dip switch... */
 	acia_init();
 #endif /* MACHINE_FIREBEE */

@@ -415,17 +442,18 @@ void BaS(void)

 	/* Jump into the OS */
 	typedef void void_func(void);
-    struct rom_header
-    {
+	typedef struct {
 		void *initial_sp;
 		void_func *initial_pc;
-    };
+	} ROM_HEADER;

 	xprintf("BaS initialization finished, enable interrupts\r\n");
 	enable_coldfire_interrupts();
-    init_isr();
+
+	//set_ipl(0);
+	network_init();

 	xprintf("call EmuTOS\r\n");
-    struct rom_header *os_header = (struct rom_header *) TOS;
+	ROM_HEADER* os_header = (ROM_HEADER*)TOS;
 	os_header->initial_pc();
 }
--- a/sys/cache.c
+++ b/sys/cache.c
@@ -32,7 +32,7 @@ void cacr_set(uint32_t value)
 	__asm__ __volatile__("movec	%0, cacr\n\t"
 						 : /* output */
 						 : "r" (rt_cacr)
-						 : "memory" /* clobbers */);
+						 : /* clobbers */);
 }

 uint32_t cacr_get(void)
@@ -42,23 +42,6 @@ uint32_t cacr_get(void)
 	return rt_cacr;
 }

-void disable_data_cache(void)
-{
-	flush_and_invalidate_caches();
-	cacr_set((cacr_get() | CF_CACR_DCINVA) & ~CF_CACR_DEC);
-}
-
-void disable_instruction_cache(void)
-{
-	flush_and_invalidate_caches();
-	cacr_set((cacr_get() | CF_CACR_ICINVA) & ~CF_CACR_IEC);
-}
-
-void enable_data_cache(void)
-{
-	cacr_set(cacr_get() & ~CF_CACR_DCINVA);
-}
-
 void flush_and_invalidate_caches(void)
 {
    __asm__ __volatile__(
@@ -78,7 +61,7 @@ void flush_and_invalidate_caches(void)
            "	bne.s		cfa_setloop			| no->\n\t"
            /* input */	:
            /* output */	:
-			/* clobber */	: "cc", "d0", "d1", "a0"
+            /* clobber */	: "d0", "d1", "a0"
 	);
 }

@@ -95,11 +78,9 @@ void flush_icache_range(void *address, size_t size)
 	start_set = (uint32_t) address & _ICACHE_SET_MASK;
 	end_set = (uint32_t) endaddr & _ICACHE_SET_MASK;

-	if (start_set > end_set)
-	{
+	if (start_set > end_set) {
 		/* from the begining to the lowest address */
-        for (set = 0; set <= end_set; set += (0x10 - 3))
-        {
+		for (set = 0; set <= end_set; set += (0x10 - 3)) {
            __asm__ __volatile__(
                        "       cpushl  ic,(%[set])         \n\t"
                        "       addq.l  #1,%[set]           \n\t"
@@ -110,14 +91,13 @@ void flush_icache_range(void *address, size_t size)
                        "       cpushl  ic,(%[set])         \n\t"
                 : /* output parameters  */
                 : [set] "a" (set)    /* input parameters */
-				 : "cc"             /* clobbered registers */
+                 :
            );
 		}
 		/* next loop will finish the cache ie pass the hole */
 		end_set = LAST_ICACHE_ADDR;
 	}
-	for (set = start_set; set <= end_set; set += (0x10 - 3))
-	{
+	for (set = start_set; set <= end_set; set += (0x10 - 3)) {
        __asm__ __volatile__(
                    "       cpushl  ic,(%[set])             \n\t"
                    "       addq.l  #1,%[set]               \n\t"
@@ -128,7 +108,7 @@ void flush_icache_range(void *address, size_t size)
                    "       cpushl  ic,(%[set])"
                    : /* output parameters */
                    : [set] "a" (set)
-					: "cc"
+                    :
         );
 	}
 }
@@ -163,7 +143,7 @@ void flush_dcache_range(void *address, size_t size)
                        "       cpushl  dc,(%[set])         \n\t"
                        : /* output parameters */
                        : [set] "a" (set)
-						: "cc" /* clobbered registers */
+                        : /* clobbered registers */
            );
 		}
 		/* next loop will finish the cache ie pass the hole */
@@ -181,61 +161,7 @@ void flush_dcache_range(void *address, size_t size)
                    "       cpushl      dc,(%[set])     \n\t"
                    : /* output parameters */
                    : [set] "a" (set)
-					: "cc" /* clobbered registers */
-		);
-	}
-}
-
-/*
- * flush and invalidate a specific region from the both caches. We do not know if the area is cached
- * at all, we do not know in which of the four ways it is cached, but we know the index where they
- * would be cached if they are, so we only need to flush and invalidate only a subset of the 512 index
- * entries, but all four ways.
- */
-void flush_cache_range(void *address, size_t size)
-{
-    unsigned long set;
-    unsigned long start_set;
-    unsigned long end_set;
-    void *endaddr;
-
-    endaddr = address + size;
-    start_set = (uint32_t) address & _DCACHE_SET_MASK;
-    end_set = (uint32_t) endaddr & _DCACHE_SET_MASK;
-
-    if (start_set > end_set) {
-        /* from the begining to the lowest address */
-        for (set = 0; set <= end_set; set += (0x10 - 3))
-        {
-            __asm__ __volatile__(
-                        "       cpushl  bc,(%[set])         \n\t"
-                        "       addq.l  #1,%[set]           \n\t"
-                        "       cpushl  bc,(%[set])         \n\t"
-                        "       addq.l  #1,%[set]           \n\t"
-                        "       cpushl  bc,(%[set])         \n\t"
-                        "       addq.l  #1,%[set]           \n\t"
-                        "       cpushl  bc,(%[set])         \n\t"
-                        : /* output parameters */
-                        : [set] "a" (set)
-                        : "cc" /* clobbered registers */
-            );
-        }
-        /* next loop will finish the cache ie pass the hole */
-        end_set = LAST_DCACHE_ADDR;
-    }
-    for (set = start_set; set <= end_set; set += (0x10 - 3))
-    {
-        __asm__ __volatile__(
-                    "       cpushl      bc,(%[set])     \n\t"
-                    "       addq.l      #1,%[set]       \n\t"
-                    "       cpushl      bc,(%[set])     \n\t"
-                    "       addq%.l     #1,%[set]       \n\t"
-                    "       cpushl      bc,(%[set])     \n\t"
-                    "       addq.l      #1,%[set]       \n\t"
-                    "       cpushl      bc,(%[set])     \n\t"
-                    : /* output parameters */
-                    : [set] "a" (set)
-                    : "cc" /* clobbered registers */
+                    : /* clobbered registers */
        );
 	}
 }
--- a/sys/driver_mem.c
+++ b/sys/driver_mem.c
@@ -11,7 +11,8 @@
 * option any later version.
 */

-#include <bas_types.h>
+#include <stdint.h>
+#include <stdbool.h>
 #include "bas_string.h"
 #include "bas_printf.h"
 #include "usb.h"
@@ -27,7 +28,8 @@
 #error "unknown machine!"
 #endif

-#define DBG_DM
+//#define DBG_DM
+
 #ifdef	DBG_DM
 #define	dbg(fmt, args...)	xprintf(fmt, ##args)
 #else
@@ -271,7 +273,7 @@ void *driver_mem_alloc(uint32_t amount)
 	
 	if (amount == -1L)
 	{
-		return (void *) ffit(-1L, &pmd);
+		return((void *)ffit(-1L, &pmd));
 	}
 	
 	if (amount <= 0 )
@@ -294,7 +296,7 @@ void *driver_mem_alloc(uint32_t amount)
 	set_ipl(level);
 	dbg("%s: driver_mem_alloc(%d) = 0x%08X\r\n", __FUNCTION__, amount, ret);
 	
-	return ret;
+	return(ret);
 }

 static int use_count = 0;
@@ -318,8 +320,7 @@ int driver_mem_init(void)
 	}
 	use_count++;
 	dbg("%s: driver_mem now has a use count of %d\r\n", __FUNCTION__, use_count);
-
-	return 0;
+	return(0);
 }

 void driver_mem_release(void)
--- a/sys/exceptions.S
+++ b/sys/exceptions.S
@@ -20,6 +20,8 @@
 *      Author: Markus Fröschle
 */

+#define DBG_EXC
+
 #include "startcf.h"
 #if MACHINE_FIREBEE
 #include "firebee.h"
@@ -45,37 +47,30 @@
 		.extern _irq5_handler
 		.extern _irq7_handler

+/* Register read/write macros */
+#define MCF_MMU_MMUCR            	__MMUBAR
+#define MCF_MMU_MMUOR			__MMUBAR+0x04
+#define MCF_MMU_MMUSR                   __MMUBAR+0x08
+#define MCF_MMU_MMUAR                   __MMUBAR+0x10
+#define MCF_MMU_MMUTR                   __MMUBAR+0x14
+#define MCF_MMU_MMUDR                   __MMUBAR+0x18
+
+#define MCF_EPORT_EPPAR                 __MBAR+0xF00
+#define MCF_EPORT_EPDDR                 __MBAR+0xF04
+#define MCF_EPORT_EPIER                 __MBAR+0xF05
+#define MCF_EPORT_EPDR                  __MBAR+0xF08
+#define MCF_EPORT_EPPDR                 __MBAR+0xF09
+#define MCF_EPORT_EPFR                  __MBAR+0xF0C
+
+#define MCF_GPIO_PODR_FEC1L             __MBAR+0xA07
+#define MCF_PSC0_PSCTB_8BIT             __MBAR+0x860C
+
+#define MCF_PSC3_PSCRB_8BIT             __MBAR+0x890C
+#define MCF_PSC3_PSCTB_8BIT             __MBAR+0x890C
+
 		.global	_vec_init

-
-/* Register read/write equates */
-
-		/* MMU */
-		.equ	MCF_MMU_MMUCR, __MMUBAR
-		.equ	MCF_MMU_MMUOR, __MMUBAR+0x04
-		.equ	MCF_MMU_MMUSR, __MMUBAR+0x08
-		.equ	MCF_MMU_MMUAR, __MMUBAR+0x10
-		.equ	MCF_MMU_MMUTR, __MMUBAR+0x14
-		.equ	MCF_MMU_MMUDR, __MMUBAR+0x18
-
-		/* EPORT flag register */
-		.equ	MCF_EPORT_EPFR, __MBAR+0xf0c
-
-		/* FEC1 port output data direction register */
-		.equ	MCF_GPIO_PODR_FEC1L, __MBAR+0xa07
-
-		/* PSC0 transmit buffer register */
-		.equ	MCF_PSC0_PSCTB_8BIT, __MBAR+0x860c
-
-		/* GPT mode select register */
-		.equ	MCF_GPT0_GMS, __MBAR+0x800
-
-		/* Slice timer 0 count register */
-		.equ	MCF_SLT0_SCNT, __MBAR+0x908
-
-
-/* interrupt sources */
-
+		// interrupt sources
 		.equ	INT_SOURCE_EPORT_EPF1,1		// edge port flag 1
 		.equ	INT_SOURCE_EPORT_EPF2,2		// edge port flag 2
 		.equ	INT_SOURCE_EPORT_EPF3,3		// edge port flag 3
@@ -131,27 +126,107 @@
 		.equ	vbasehi, 0xffff8201


+/* MMU register read/write macros */
+
+#define MCF_MMU_MMUCR			    __MMUBAR
+#define MCF_MMU_MMUOR			    __MMUBAR+0x04
+#define MCF_MMU_MMUSR			    __MMUBAR+0x08
+#define MCF_MMU_MMUAR			    __MMUBAR+0x10
+#define MCF_MMU_MMUTR			    __MMUBAR+0x14
+#define MCF_MMU_MMUDR			    __MMUBAR+0x18


-/*
- * macros
- */
+/* Bit definitions and macros for MCF_MMU_MMUCR */
+#define MCF_MMU_MMUCR_EN                     (0x1)
+#define MCF_MMU_MMUCR_ASM                    (0x2)
+
+/* Bit definitions and macros for MCF_MMU_MMUOR */
+#define MCF_MMU_MMUOR_UAA                    (0x1)
+#define MCF_MMU_MMUOR_ACC                    (0x2)
+#define MCF_MMU_MMUOR_RW                     (0x4)
+#define MCF_MMU_MMUOR_ADR                    (0x8)
+#define MCF_MMU_MMUOR_ITLB                   (0x10)
+#define MCF_MMU_MMUOR_CAS                    (0x20)
+#define MCF_MMU_MMUOR_CNL                    (0x40)
+#define MCF_MMU_MMUOR_CA                     (0x80)
+#define MCF_MMU_MMUOR_STLB                   (0x100)
+#define MCF_MMU_MMUOR_AA(x)                  (((x)&0xFFFF)<<0x10)
+
+/* Bit definitions and macros for MCF_MMU_MMUSR */
+#define MCF_MMU_MMUSR_HIT                    (0x2)
+#define MCF_MMU_MMUSR_WF                     (0x8)
+#define MCF_MMU_MMUSR_RF                     (0x10)
+#define MCF_MMU_MMUSR_SPF                    (0x20)
+
+/* Bit definitions and macros for MCF_MMU_MMUAR */
+#define MCF_MMU_MMUAR_FA(x)                  (((x)&0xFFFFFFFF)<<0)
+
+/* Bit definitions and macros for MCF_MMU_MMUTR */
+#define MCF_MMU_MMUTR_V                      (0x1)
+#define MCF_MMU_MMUTR_SG                     (0x2)
+#define MCF_MMU_MMUTR_ID(x)                  (((x)&0xFF)<<0x2)
+#define MCF_MMU_MMUTR_VA(x)                  (((x)&0x3FFFFF)<<0xA)
+
+/* Bit definitions and macros for MCF_MMU_MMUDR */
+#define MCF_MMU_MMUDR_LK                     (0x2)
+#define MCF_MMU_MMUDR_X                      (0x4)
+#define MCF_MMU_MMUDR_W                      (0x8)
+#define MCF_MMU_MMUDR_R                      (0x10)
+#define MCF_MMU_MMUDR_SP                     (0x20)
+#define MCF_MMU_MMUDR_CM(x)                  (((x)&0x3)<<0x6)
+#define MCF_MMU_MMUDR_SZ(x)                  (((x)&0x3)<<0x8)
+#define MCF_MMU_MMUDR_PA(x)                  (((x)&0x3FFFFF)<<0xA)
+
+#define	 std_mmutr	(MCF_MMU_MMUTR_SG|MCF_MMU_MMUTR_V)
+#define	 writethrough_mmudr	(MCF_MMU_MMUDR_SZ(00)|MCF_MMU_MMUDR_CM(00)|MCF_MMU_MMUDR_R|MCF_MMU_MMUDR_W|MCF_MMU_MMUDR_X)
+#define	 copyback_mmudr	(MCF_MMU_MMUDR_SZ(00)|MCF_MMU_MMUDR_CM(01)|MCF_MMU_MMUDR_R|MCF_MMU_MMUDR_W|MCF_MMU_MMUDR_X)
+
+		// equates for (experimental) video page copying via Coldfire DMA
+		.equ	MCD_SINGLE_DMA, 0x100
+		.equ	MCD_TT_FLAGS_CW, 0x2
+		.equ	MCD_TT_FLAGS_RL, 0x1
+		.equ	MCD_TT_FLAGS_SP, 0x4
+		.equ	DMA_ALWAYS, 0
+
+/* Register read/write macros */
+#define MCF_GPT0_GMS                         __MBAR+0x800
+#define MCF_SLT0_SCNT                        __MBAR+0x908
+
 		.altmacro
 		.macro	irq	vector,int_mask,clr_int
 		move.w	#0x2700,sr			// disable interrupt
-		subq.l	#8,sp
-		movem.l	d0/a5,(sp)		// save registers
+		subq.l	#8,a7
+		movem.l	d0/a5,(a7)			// save registers

 		lea	MCF_EPORT_EPFR,a5
 		move.b	#\clr_int,(a5)			// clear int pending

-		movem.l	(sp),d0/a5		// restore registers
-		addq.l	#8,sp
-		move.l	\vector,-(sp)
+		movem.l	(a7),d0/a5			// restore registers
+		addq.l	#8,a7
+		move.l	\vector,-(a7)
 		move	#0x2\int_mask\()00,sr
 		rts
 		.endm

+/*
+ * FIXME: this is a GNU gas kludge. Ugly, but I just can't come up with any smarter solution
+ *
+ * GNU as does not support multi-character constants. At least I don't know of any way it would.
+ * The following might look more than strange, but I considered the statement
+ *
+ * mchar	move.l, 'T,'E,'S,'T,-(SP)
+ *
+ * somewhat more readable than
+ *
+ * move.l #1413829460,-(SP)
+ *
+ * If anybody knows of any better way on how to do this - please do!
+ *
+ */
+	.macro mchar  st,a,b,c,d,tgt
+	\st #\a << 24|\b<<16|\c<<8|\d,\tgt
+	.endm
+
 	.text
 _vec_init:
 	move.l	a2,-(sp)			    // Backup registers
@@ -164,6 +239,7 @@ _vec_init:
 	movec	d0,VBR
 	move.l	d0,a0
 	move.l	a0,a2
+
 init_vec:
 		move.l	#256,d0
 		lea	std_exc_vec(pc),a1		// standard vector
@@ -177,7 +253,7 @@ init_vec_loop:
 		lea	reset_vector(pc),a1		// set reset vector
 		move.l	a1,0x04(a0)

-		lea	access(pc),a1		// set illegal access exception handler
+		lea	access_exception(pc),a1		// set illegal access exception handler
 		move.l	a1,0x08(a0)

 		.extern	_get_bas_drivers
@@ -202,6 +278,10 @@ init_vec_loop:
 		lea	irq7(pc),a1
 		move.l	a1,0x11c(a0)

+// install PSC vectors (used for PIC communication on the FireBee)
+		lea	handler_psc3(pc),a1
+		// PSC3 interrupt source = 32
+		move.l	a1,(INT_SOURCE_PSC3 + 64) * 4(a0)

 // timer vectors (triggers when vbashi gets changed, used for video page copy)
 		lea	handler_gpt0(pc),a1
@@ -218,11 +298,8 @@ init_vec_loop:
 // install lowlevel_isr_handler for the FEC0  interrupt
 		move.l	a1,(INT_SOURCE_FEC0 + 64) * 4(a0)

-// install lowlevel_isr_handler for the PSC3 interrupt
-		move.l	a1,(INT_SOURCE_PSC3 + 64) * 4(a0)
-
 #ifndef MACHINE_FIREBEE
-// FEC1 not wired on the FireBee, but used on other machines
+// FEC1 not wired on the FireBee
 		move.l	a1,(INT_SOURCE_FEC1 + 64) * 4(a0)
 #endif

@@ -231,17 +308,19 @@ init_vec_loop:

 		move.l	(sp)+,a2			// Restore registers
 		rts
+
+
 /*
 * exception vector routines
 */
 vector_table_start:
 std_exc_vec:
 		move.w	#0x2700,sr			// disable interrupt
-		subq.l	#8,sp
+		subq.l	#8,a7
 		movem.l	d0/a5,(sp)			// save registers
 		move.w	8(sp),d0			// fetch vector
 		and.l	#0x3fc,d0			// mask out vector number
-#define DBG_EXC
+
 #ifdef DBG_EXC
 		// printout vector number of exception

@@ -249,17 +328,16 @@ std_exc_vec:
 		movem.l	d0-d1/a0-a1,(sp)		// save gcc scratch registers

 		lsr.l	#2,d0				// shift vector number in place
-
-		cmp.l	#33,d0			// do not debug-print various traps
-		beq	noprint			// this would slow down interrupt
-		cmp.l	#34,d0			// processing enormously
+		cmp.l	#33,d0
+		beq		noprint
+		cmp.l	#34,d0
 		beq		noprint
 		cmp.l	#45,d0
 		beq		noprint
 		cmp.l	#46,d0
 		beq		noprint
 		move.l	4 * 4 + 8 + 4(sp),-(sp)		// pc at exception
-		move.l	d0,-(sp)		// vector number
+		move.l	d0,-(sp)			// provide it to xprintf()
 		pea	exception_text
 		jsr	_xprintf			// call xprintf()
 		add.l	#3*4,sp				// adjust stack
@@ -274,17 +352,16 @@ noprint:
 		move.l	(a5),d0				// fetch exception routine address

 		move.l	4(sp),a5			// restore a5
-		move.l	d0,4(sp)		// store exception routine address
+		move.l	d0,4(a7)			// store exception routine address

-		// FIXME: what does this do and why?
-		move.w	10(sp),d0		// restore original SR
+		move.w	10(a7),d0			// restore original SR
 		bset	#13,d0				// set supervisor bit
 		move.w	d0,sr				//
-		move.l	(sp)+,d0		// restore d0
+		move.l	(a7)+,d0			// restore d0
 		rts					// jump to exception routine

 exception_text:
-		.ascii	"DEBUG: EXCEPTION 0x%x caught at %p"
+		.ascii	"DEBUG: EXCEPTION %d caught at %p"
 		.byte	13, 10, 0
 		.align	4

@@ -295,37 +372,43 @@ reset_vector:
 		beq	std_exc_vec			// yes->
 		jmp	_rom_entry	 		// no, cold start machine

-access:
-		move.w	#0x2700,sr		// disable interrupts
+//
+// Triggered when code tries to access a memory area that is not known to the MMU yet.
+// This is either a "classic" bus error or the MMU hit a "legal" page not yet mapped.
+//
+access_exception:
+		move.w	#0x2700,sr			// avoid us being interrupted by the video handler
+							// (this would probably overwrite the MMUAR register)

-		link	a6,#-4 * 4		// make room for gcc scratch registers
-		movem.l	d0-d1/a0-a1,(sp)	// and save them
+		// save gcc scratch registers, others will be handled by called function
+		lea	-4*4(sp),sp
+		movem.l	d0-d1/a0-a1,(sp)

-		move.l	4(a6),-(sp)		// get format_status longword
-		move.l	8(a6),-(sp)		// PC at exception
-		move.l	MCF_MMU_MMUAR,-(sp)	// fault address
-		move.l	MCF_MMU_MMUSR,-(sp)	// MMU status register
-		move.w	#0x2300,sr		// can lower interrupt mask once MMU status is safe
-		jsr	_mmutr_miss
-		lea	4 * 4(sp),sp		// adjust stack

-		tst.l	d0			// exception handler signals bus error
-		bne	bus_error
+		lea	4*4(sp),a0			// original stack pointer
+
+		move.l	(a0),-(sp)			// format status word
+		move.l	4(a0),-(sp)			// program counter at access error
+
+		jsr	_access_exception		// note the underscore
+		lea	2*4(sp),sp			// adjust stack
+
+		tst.l	d0				// handled?
+
+		movem.l	(sp),d0-d1/a0-a1		// restore scratch registers
+		lea		4*4(sp),sp
+
+		beq	bus_error			// no

-		movem.l	(sp),d0-d1/a0-a1	// restore stack
-		unlk	a6
 		rte

 bus_error:
-		movem.l	(sp),d0-d1/a0-a1
-		unlk	a6
 		bra	std_exc_vec

 zero_divide:
-		move.w	#0x2700,sr		// disable interrupt
-		move.l	a0,-(sp)
-		move.l	d0,-(sp)
-		move.l	12(sp),a0		// pc
+		move.l	a0,-(a7)
+		move.l	d0,-(a7)
+		move.l	12(a7),a0			// pc
 		move.w	(a0)+,d0			// command word
 		btst	#7,d0				// long?
 		beq	zd_word				// nein->
@@ -347,41 +430,16 @@ zd_nal:	cmp.w	#0x3c,d0			// immediate?
 		beq	zd_end				// no
 		addq.l	#2,a0
 zd_end:
-		move.l	a0,12(sp)
-		move.l	(sp)+,d0
-		move.l	(sp)+,a0
+		move.l	a0,12(a7)
+		move.l	(a7)+,d0
+		move.l	(a7)+,a0
 		rte

-#ifdef _NOT_USED_
-linea:
-		move.w	#0x2700,sr		// disable interrupt
-		halt
-		nop
-		nop
-linef:
-		move.w	#0x2700,sr		// disable interrupt
-		halt
-		nop
-		nop
-format:
-		move.w	#0x2700,sr		// disable interrupt
-		halt
-		nop
-		nop
-
-//floating point
-flpoow:
-		move.w	#0x2700,sr		// disable interrupt
-		halt
-		nop
-		nop
-#endif /* _NOT_USED */
-
 irq1:
 		irq	0x64,1,0x02

 irq2:		// hbl
-						//		move.b	#3,2(sp)
+		//	move.b	#3,2(a7)
 		//	rte
 		irq	0x68,2,0x04

@@ -391,7 +449,7 @@ irq3:
 irq4:		// vbl
 		irq	0x70,4,0x10

-#if MACHINE_M5484LITE_notyet			// handlers for M5484LITE
+#if MACHINE_M5484LITE					// handlers for M5484LITE

 irq5:							// irq5 is tied to PCI INTC# and PCI INTD# on the M5484LITE
 		move.w	#0x2700,sr			// disable interrupts
@@ -428,23 +486,119 @@ irq7:						// irq7 is tied to PCI INTA# and PCI INTB# on the M5484LITE
 		rte					// return from exception

 irq7text:
-		.data
 		.ascii	"IRQ7!"
 		.dc.b	13,10,0
-		.text

 #elif MACHINE_FIREBEE		/* these handlers are only meaningful for the Firebee */
-irq5:						// irq5 is tied to PCI INTC# and PCI INTD# on the M5484LITE
+irq5:
 		irq	0x74,5,0x20

+		.extern	_irq6_interrupt_handler		// highlevel C handler
+
 irq6:	// MFP interrupt from FPGA
-		move.w	#0x2700,sr		// disable interrupt
-		subq.l	#8,sp
-		movem.l	d0/a5,(sp)		// save registers
+		move.w	#0x2700,sr			// disable interrupts
+
+		lea	-4 * 4(sp),sp			// save gcc scratch registers
+		movem.l	d0-d1/a0-a1,(sp)
+
+		move.l	4 * 4(sp),-(sp)			// push original exception stack frame
+		move.l	5 * 4(sp),-(sp)
+		jsr	_irq6_interrupt_handler		// call highlevel C handler
+		lea.l	2 * 4(sp),sp
+
+		tst.l	d0				// completely handled?
+
+		movem.l	(sp),d0-d1/a0-a1		// restore registers saved above
+		lea	4 * 4(sp),sp			// adjust stack
+
+		beq	irq6_os				// call OS handler
+		rte
+
+irq6_os:	// call native OS irq6 handler
+		move.l	a5,-(sp)			// save registers: TODO: this could be done more effective
+		move.l	d0,-(sp)
+		move.l	0xf0020000,a5			// fetch vector
+		add.l	_rt_vbr,a5			// add vector base
+		move.l	(a5),d0				// fetch handler
+		move.l	4(sp),a5			// restore a5
+		move.l	d0,4(sp)			// prepare indirect return
+		move.l	(sp)+,d0			// restore d0
+		move.w	#0x2600,sr			// set interrupt mask
+		rts
+
+#ifdef _NOT_USED_	/* functionality moved to _irq6_interrupt_handler() (C) */
+		subq.l	#8,a7
+		movem.l	d0/a5,(a7)			// save registers

 		lea	MCF_EPORT_EPFR,a5		// clear int6 from edge port
 		bset	#6,(a5)

+		// there was a potential bug here before: would also clear all other edge port interrupts that might have happened...
+		// move.b	#0x40,(a5)			// clear int6 from edge port
+
+// screen adr change timed out?
+		move.l	_video_sbt,d0
+		beq	irq6_non_sca			// nothing to do if 0
+		sub.l	#0x70000000,d0			// substract 14 seconds
+		lea	MCF_SLT0_SCNT,a5
+		cmp.l	(a5),d0				// time reached?
+		ble	irq6_non_sca			// not yet
+
+		lea	-28(a7),a7			// save more registers
+		movem.l	d0-d4/a0-a1,(a7)		//
+		clr.l	d3				// beginn mit 0
+		jsr	_flush_and_invalidate_caches
+
+ // eintrag suchen
+ irq6_next_sca:
+		move.l	d3,d0
+		move.l	d0,MCF_MMU_MMUAR		// addresse
+		move.l	#0x106,d4
+		move.l	d4,MCF_MMU_MMUOR		// suchen ->
+		nop
+		move.l	MCF_MMU_MMUOR,d4
+		clr.w	d4
+		swap	d4
+		move.l	d4,MCF_MMU_MMUAR
+		mvz.w	#0x10e,d4
+		move.l	d4,MCF_MMU_MMUOR		// einträge holen aus mmu
+		nop
+		move.l	MCF_MMU_MMUTR,d4		// ID holen
+		lsr.l	#2,d4				// bit 9 bis 2
+		cmp.w	#sca_page_ID,d4			// ist screen change ID?
+		bne	irq6_sca_pn			// nein -> page keine screen area next
+// eintrag <EFBFBD>ndern
+		add.l	#std_mmutr,d0
+		move.l	d3,d1				// page 0?
+		beq	irq6_sca_pn0			// ja ->
+		add.l	#copyback_mmudr,d1		// sonst page cb
+		bra	irq6_sca_pn1c
+irq6_sca_pn0:
+		add.l	#writethrough_mmudr|MCF_MMU_MMUDR_LK,d1	// page wt and locked
+irq6_sca_pn1c:
+		mvz.w	#0x10b,d2			// MMU update
+		move.l	d0,MCF_MMU_MMUTR
+		move.l	d1,MCF_MMU_MMUDR
+		move.l	d2,MCF_MMU_MMUOR		// setze tlb data only
+		nop
+// page copy
+		move.l	d3,a0
+		add.l	#0x60000000,a0
+		move.l	d3,a1
+		move.l	#0x10000,d4			// one whole page (1 MB)
+
+irq6_sca_pn:
+		add.l	#0x00100000,d3			// next
+		cmp.l	#0x00d00000,d3			// ende?
+		blt		irq6_next_sca		// nein->
+
+		move.l	#0x2000,d0
+		move.l	d0,_video_tlb			// anfangszustand wieder herstellen
+		clr.l	_video_sbt			// zeit löschen
+
+		movem.l	(sp),d0-d4/a0-a1		// restore registers
+		lea	7 * 4(sp),sp
+
 irq6_non_sca:
 // test auf acsi dma -----------------------------------------------------------------
 	lea		0xfffffa0b,a5
@@ -458,8 +612,8 @@ non_acsi_dma:
 		bne	irq6_1
 		tst.b	2(a5)
 		bne	irq6_1
-		movem.l	(sp),d0/a5
-		addq.l	#8,sp
+		movem.l	(a7),d0/a5
+		addq.l	#8,a7
 		rte
 irq6_1:
 		lea	MCF_GPIO_PODR_FEC1L,a5
@@ -472,12 +626,12 @@ irq6_1:
 		lea	MCF_GPIO_PODR_FEC1L,a5
 		bset.b	#4,(a5)					// led off
 irq6_2:
-		move.l	0xF0020000,a5		// vector holen
+		move.l	0xf0020000,a5				// vector holen
 		add.l	_rt_vbr,a5			    	// basis
 		move.l	(a5),d0					// vector holen
-		move.l	4(sp),a5		// a5 zurück
-		move.l	d0,4(sp)		// vector eintragen
-		move.l	(sp)+,d0		// d0 zurück
+		move.l	4(a7),a5				// a5 zurück
+		move.l	d0,4(a7)				// vector eintragen
+		move.l	(a7)+,d0				// d0 zurück
 		move	#0x2600,sr
 		rts

@@ -491,10 +645,14 @@ blinker:.long	0
 * pseudo dma
 */
 acsi_dma:							// atari dma
-		move.l  a1,-(sp)
-		move.l  d1,-(sp)
+		move.l  a1,-(a7)
+		move.l  d1,-(a7)

 		lea	MCF_PSC0_PSCTB_8BIT,a1	// ++ vr
+		mchar move.l, 'D,'M','A,'\ ,(a1)
+		//move.l	#"DMA ",(a1)
+		mchar	move.l,'I,'N,'T,'!,(a1)
+		// move.l	#'INT!',(a1)

 		lea 	0xf0020110,a5		// fifo daten
 acsi_dma_start:
@@ -543,9 +701,12 @@ acsi_dma_end:
 		move.w	#0x0d0a,d1
 		move.w	d1,MCF_PSC0_PSCTB_8BIT

-		move.l	(sp)+,d1
-		move.l	(sp)+,a1
+		move.l	(a7)+,d1
+		move.l	(a7)+,a1
 		rts
+
+#endif /* _NOT_USED_ */
+
 /*
 * irq 7 = pseudo bus error
 */
@@ -571,34 +732,122 @@ irq7:
 		move.l		(sp)+,a0
 		rts								// Forward to the Access Error handler

-
 /*
- * general purpose timer 0 (GPT0): video change, later also others.
- *
- * GPT0 is used as input trigger. It is connected to the TIN0 signal of
- * the FPGA and triggers everytime vbasehi is written to, i.e.
- * when the video base address gets changed. In the "MiNT-compatible MMU"-version this
- * doesn't do anything, currently, but
- * TODO: could be used for e.g. activating copyback cache mode on those ST-RAM pages
- * that aren't video pages.
+ * psc3 com PIC MCF
 */
+handler_psc3:
+		.extern _pic_interrupt_handler

+		move.w	#0x2700,sr				// disable interrupt
+		lea	-4 * 4(sp),sp				// save gcc scratch registers
+		movem.l	d0-d1/a0-a1,(sp)

-handler_gpt0:
-		.extern _gpt0_interrupt_handler
-
-		move.w	#0x2700,sr		// disable interrupts
-		link	a6,#-4 * 4		// make room for
-		movem.l	d0-d1/a0-a1,(sp)	// gcc scratch registers and save them,
-						// other registers will be handled by gcc itself
-		move.w	4(a6),d0		// fetch vector number from stack
-		move.l	d0,-(sp)		// push it
-		jsr	_gpt0_interrupt_handler	// call C handler
-		addq.l	#4,sp			// adjust stack
+		jsr	_pic_interrupt_handler			// call high level interrupt handler

 		movem.l	(sp),d0-d1/a0-a1			// restore registers
+		rte

-		unlk	a6
+/*
+ * general purpose timer 0 (GPT0): video change, later also others. GPT0 is used as
+ * input trigger. It is connected to the TIN0 signal of the FPGA which triggers it everytime
+ * vbasehi is written to, i.e. when the video base address gets changed
+ */
+handler_gpt0:
+		move	#0x2700,sr				// disable interrupts
+
+		lea	-28(a7),a7				// save registers
+		movem.l	d0-d4/a0-a1,(a7)
+
+		mvz.b	vbasehi,d0				// screen base address high
+		cmp.w	#2,d0					// screen base lower than 0x20000?
+		blt	video_chg_end				// yes, do nothing
+		cmp.w	#0xd0,d0				// lower than 0xd00000? - normal Falcon video area, mapped
+								// to 60d00000 (FPGA video memory)
+		blt	sca_other
+
+		lea	MCF_SLT0_SCNT,a0
+		move.l	(a0),_video_sbt				// save time
+
+		bra	video_chg_end
+		// FIXME: don't we need to get out here?
+
+sca_other:
+		lsl.l	#8,d0					// build new screen start address from Atari register contents
+		move.b	0xffff8203,d0				// mid byte
+		lsl.l	#8,d0
+		move.b  0xffff820d,d0				// low byte
+		move.l	d0,d3
+
+video_chg_1page:
+// check if page is already marked as video page
+		moveq	#20,d4
+		move.l	d0,d2
+		lsr.l	d4,d2					// new page
+		move.l	_video_tlb,d4
+		bset.l	d2,d4					// set as changed
+		bne	video_chg_2page				// was it set already?
+		move.l	d4,_video_tlb
+		jsr	_flush_and_invalidate_caches
+
+video_copy_data:
+		move.l	d4,_video_tlb
+		and.l	#0x00f00000,d0
+		move.l	d0,a0
+		move.l	a0,a1
+		add.l	#0x60000000,a1
+		move.l	#0x10000,d4				// whole page
+
+video_copy_data_loop:
+		move.l	(a0)+,(a1)+				// copy video page contents to real screen
+		move.l	(a0)+,(a1)+
+		move.l	(a0)+,(a1)+
+		move.l	(a0)+,(a1)+
+		subq.l	#1,d4
+		bne	video_copy_data_loop
+
+// eintrag suchen
+		move.l	d0,MCF_MMU_MMUAR			// adress
+		move.l	#0x106,d4
+		move.l	d4,MCF_MMU_MMUOR			// search -> new one will be offered if not found
+		nop
+		move.l	MCF_MMU_MMUOR,d4
+		clr.w	d4
+		swap	d4
+		move.l	d4,MCF_MMU_MMUAR
+		move.l	d0,d1
+		add.l	#MCF_MMU_MMUTR_ID(sca_page_ID)|std_mmutr,d0
+		add.l	#0x60000000|writethrough_mmudr|MCF_MMU_MMUDR_LK,d1
+		mvz.w	#0x10b,d2				// MMU update
+		move.l	d0,MCF_MMU_MMUTR
+		move.l	d1,MCF_MMU_MMUDR
+		move.l	d2,MCF_MMU_MMUOR			// setzen vidoe maped to 60xxx only data
+		nop
+
+video_chg_2page:
+// test of adjacent page is needed also
+		move.l	d3,d0
+		mvz.w	0xffff8210,d4				// byts pro zeile
+		mvz.w	0xffff82aa,d2				// zeilen ende
+		mvz.w	0xffff82a8,d1				// zeilenstart
+		sub.l	d1,d2					// differenz = anzahl zeilen
+		mulu	d2,d4					// maximal 480 zeilen
+		add.l	d4,d0					// video gr<EFBFBD>sse
+		cmp.l	#__STRAM_END,d0				// maximale addresse
+		bge	video_chg_end				// wenn gleich oder gr<EFBFBD>sser -> fertig
+		moveq	#20,d4
+		move.l	d0,d2
+		lsr.l	d4,d2					// neue page
+		move.l	_video_tlb,d4
+		bset.l	d2,d4					// setzen als ge<EFBFBD>ndert
+		beq	video_copy_data				// nein nochmal
+video_chg_end:
+		lea	MCF_GPT0_GMS,a0				// clear interrupt
+		bclr.b	#0,3(a0)
+		nop
+		bset.b	#0,3(a0)
+
+		movem.l	(a7),d0-d4/a0-a1			// restore saved registers
+		lea	7 * 4(sp),a7
 		rte
 #endif /* MACHINE_FIREBEE */

@@ -609,20 +858,17 @@ handler_gpt0:
 		.global	_lowlevel_isr_handler
 		.extern	_isr_execute_handler

-
 _lowlevel_isr_handler:
-		move.w	#0x2700,sr		// do not disturb
+		move.w	#0x2700,sr				// disable interrupts
 		link	a6,#-4*4				// make room for
-		movem.l	d0-d1/a0-a1,(sp)	// gcc scratch registers and save them,
-						// other registers will be handled by gcc itself
+		movem.l	d0-d1/a0-a1,(sp)			// gcc scratch registers and save them

 		move.w	4(a6),d0				// fetch vector number from stack
 		lsr.l	#2,d0					// move it in place
-		andi.l	#0xff,d0		// mask it out
+		andi.l	#0x000000ff,d0				// mask it out
 		move.l	d0,-(sp)				// push it
 		jsr	_isr_execute_handler			// call the C handler
-		addq.l	#4,sp			// adjust stack
-
+		lea	4(sp),sp				// adjust stack
 		movem.l	(sp),d0-d1/a0-a1			// restore registers
-		unlk	a6
+		unlk	a6					// cleanup stack
 		rte
--- a/sys/fault_vectors.c
+++ b/sys/fault_vectors.c
@@ -192,11 +192,7 @@ void setup_vectors(void)
 	__asm__ __volatile__("clr.l		d0\n\t"\
 						 "movec.l	d0,VBR\n\t"\
 						 "nop\n\t"\
-                         "move.l	d0,_rt_vbr"
-                         :                      /* outputs */
-                         :                      /* inputs */
-                         : "d0", "memory", "cc" /* clobbered registers */
-                        );
+						 "move.l	d0,_rt_vbr" ::: "d0", "memory");

 	xprintf("finished.\r\n");
 }
--- a/sys/init_fpga.c
+++ b/sys/init_fpga.c
@@ -27,31 +27,16 @@
 #include "bas_printf.h"
 #include "wait.h"

-// #define FPGA_DEBUG
-#if defined(FPGA_DEBUG)
-#define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
-#else
-#define dbg(format, arg...) do { ; } while (0)
-#endif
-
 #define FPGA_STATUS		(1 << 0)
 #define FPGA_CLOCK		(1 << 1)
 #define FPGA_CONFIG		(1 << 2)
 #define FPGA_DATA0		(1 << 3)
 #define FPGA_CONF_DONE	(1 << 5)

-extern uint8_t _FPGA_CONFIG[];
-#define FPGA_FLASH_DATA	&_FPGA_CONFIG[0]
-extern uint8_t _FPGA_CONFIG_SIZE[];
-#define FPGA_FLASH_DATA_SIZE	((uint32_t) &_FPGA_CONFIG_SIZE[0])
-
-/*
- * flag located in processor SRAM1 that indicates that the FPGA configuration has
- * been loaded through JTAG. init_fpga() will honour this and not overwrite config.
- */
-extern bool _FPGA_JTAG_LOADED;
-extern long _FPGA_JTAG_VALID;
-#define VALID_JTAG		0xaffeaffe
+extern uint8_t _FPGA_FLASH_DATA[];
+#define FPGA_FLASH_DATA	&_FPGA_FLASH_DATA[0]
+extern uint8_t _FPGA_FLASH_DATA_SIZE[];
+#define FPGA_FLASH_DATA_SIZE	((uint32_t) &_FPGA_FLASH_DATA_SIZE[0])

 void config_gpio_for_fpga_config(void)
 {
@@ -79,7 +64,7 @@ void config_gpio_for_jtag_config(void)
 						  MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L4;	/* bit 4 = LED => output */
 															/* all other bits = input */
 	/*
-	 * unfortunately, the GPIO module cannot trigger interrupts. That means CONF_DONE needs to be polled to detect
+	 * unfortunately, the GPIO module cannot trigger interrupts. That means FPGA_CONFIG needs to be polled to detect
 	 * external FPGA (re)configuration and reset the system in that case. Could be done from the OS as well...
 	 */
 }
@@ -93,15 +78,7 @@ bool init_fpga(void)
 	volatile int32_t time, start, end;
 	int i;

-	dbg("FPGA load config\r\n(_FPGA_JTAG_LOADED = %x, _FPGA_JTAG_VALID = %x)...\r\n", _FPGA_JTAG_LOADED, _FPGA_JTAG_VALID);
-	if (_FPGA_JTAG_LOADED == true && _FPGA_JTAG_VALID == VALID_JTAG)
-	{
-		dbg("detected _FPGA_JTAG_LOADED flag. Not overwriting FPGA config.\r\n");
-
-		/* reset the flag so that next boot will load config again from flash */
-		_FPGA_JTAG_LOADED = 0;
-		return true;
-	}
+	xprintf("FPGA load config... ");
 	start = MCF_SLT0_SCNT;

 	config_gpio_for_fpga_config();
--- a/sys/interrupts.c
+++ b/sys/interrupts.c
@@ -3,7 +3,6 @@
 *
 * Handle interrupts, the levels.
 *
- *
 * This file is part of BaS_gcc.
 *
 * BaS_gcc is free software: you can redistribute it and/or modify
@@ -23,18 +22,17 @@
 *      Author: Markus Fröschle
 */

-#include <bas_types.h>
+#include <stdint.h>
+#include <stdbool.h>
 #include "MCF5475.h"
 #include "bas_utils.h"
 #include "bas_printf.h"
-#include "bas_string.h"
 #include "exceptions.h"
 #include "interrupts.h"
 #include "bas_printf.h"
 #include "startcf.h"
 #include "cache.h"
 #include "util.h"
-#include "dma.h"

 extern void (*rt_vbr[])(void);
 #define VBR	rt_vbr
@@ -98,24 +96,33 @@ int register_interrupt_handler(uint8_t source, uint8_t level, uint8_t priority,
 #endif


-struct isrentry
+typedef struct
 {
 	int     vector;
 	int     (*handler)(void *, void *);
 	void    *hdev;
 	void    *harg;
-};
+} ISRENTRY;
+
+ISRENTRY isrtab[MAX_ISR_ENTRY];

-static struct isrentry isrtab[MAX_ISR_ENTRY];      /* list of interrupt service routines */

-/*
- * clear the table of interrupt service handlers
- */
 void isr_init(void)
 {
-    memset(isrtab, 0, sizeof(isrtab));
+	int index;
+
+	for (index = 0; index < MAX_ISR_ENTRY; index++)
+	{
+		isrtab[index].vector = 0;
+		isrtab[index].handler = 0;
+		isrtab[index].hdev = 0;
+		isrtab[index].harg = 0;
+	}
 }

+
+int isr_register_handler(int vector, int (*handler)(void *, void *), void *hdev, void *harg)
+{
 	/*
 	 * This function places an interrupt handler in the ISR table,
 	 * thereby registering it so that the low-level handler may call it.
@@ -124,8 +131,6 @@ void isr_init(void)
 	 * pointer to the device itself, and the second a pointer to a data
 	 * structure used by the device driver for that particular device.
 	 */
-int isr_register_handler(int vector, int (*handler)(void *, void *), void *hdev, void *harg)
-{
 	int index;

 	if ((vector == 0) || (handler == NULL))
@@ -170,7 +175,10 @@ void isr_remove_handler(int (*handler)(void *, void *))
 	{
 		if (isrtab[index].handler == handler)
 		{
-            memset(&isrtab[index], 0, sizeof(struct isrentry));
+			isrtab[index].vector = 0;
+			isrtab[index].handler = 0;
+			isrtab[index].hdev = 0;
+			isrtab[index].harg = 0;

 			return;
 		}
@@ -178,12 +186,13 @@ void isr_remove_handler(int (*handler)(void *, void *))
 	dbg("no such handler registered (handler=%p\r\n", handler);
 }

+
+bool isr_execute_handler(int vector)
+{
 	/*
 	 * This routine searches the ISR table for an entry that matches
 	 * 'vector'.  If one is found, then 'handler' is executed.
 	 */
-bool isr_execute_handler(int vector)
-{
 	int index;
 	bool retval = false;

@@ -209,11 +218,8 @@ bool isr_execute_handler(int vector)

 /*
 * PIC interrupt handler for Firebee
- *
- * Handles PIC requests that come in from PSC3 serial interface. Currently, that
- * is RTC/NVRAM requests only
 */
-int pic_interrupt_handler(void *arg1, void *arg2)
+void pic_interrupt_handler(void)
 {
 	uint8_t rcv_byte;

@@ -224,7 +230,7 @@ int pic_interrupt_handler(void *arg1, void *arg2)
 		uint8_t *rtc_data = (uint8_t *) 0xffff8963;
 		int index = 0;

-        xprintf("PIC interrupt: requesting RTC data\r\n");
+		xprintf("PIC interrupt requesting RTC data\r\n");

 		MCF_PSC3_PSCTB_8BIT = 0x82;		// header byte to PIC
 		do
@@ -233,7 +239,6 @@ int pic_interrupt_handler(void *arg1, void *arg2)
 			MCF_PSC3_PSCTB_8BIT = *rtc_data;
 		} while (index++ < 64);
 	}
-    return 1;
 }

 extern int32_t video_sbt;
@@ -405,35 +410,3 @@ bool irq6_interrupt_handler(uint32_t sf1, uint32_t sf2)

 	return handled;
 }
-
-#if defined(MACHINE_FIREBEE)
-#define vbasehi		(* (volatile uint8_t *) 0xffff8201)
-#define vbasemid	(* (volatile uint8_t *) 0xffff8203)
-#define vbaselow	(* (volatile uint8_t *) 0xffff820d)
-
-#define vwrap		(* (volatile uint16_t *) 0xffff8210)
-#define vde			(* (volatile uint16_t *) 0xffff82aa)
-#define vdb			(* (volatile uint16_t *) 0xffff82a8)
-/*
- * this is the higlevel interrupt service routine for gpt0 timer interrupts.
- *
- * It is called from handler_gpt0 in exceptions.S
- *
- * The gpt0 timer is not used as a timer, but as interrupt trigger by the FPGA which fires
- * everytime the video base address high byte (0xffff8201) gets written by user code (i.e.
- * everytime the video base address is set).
- * The interrupt service routine checks if that page was already set as a video page (in that
- * case it does nothing), if not (if we have a newly set page), it sets up an MMU mapping for
- * that page (effectively rerouting any further access to Falcon video RAM to Firebee FPGA
- * video RAM starting at 0x60000000) and copies SDRAM contents of that page to the video
- * RAM page.
- */
-void gpt0_interrupt_handler(void)
-{
-    dbg("screen base = 0x%x\r\n", vbasehi);
-
-    MCF_GPT0_GMS &= ~1;		/* rearm trigger */
-    NOP();
-    MCF_GPT0_GMS |= 1;
-}
-#endif /* MACHINE_FIREBEE */
--- a/sys/mmu.c
+++ b/sys/mmu.c
@@ -1,6 +1,5 @@
 #include "mmu.h"
 #include "acia.h"
-#include "exceptions.h"

 /*
 * mmu.c
@@ -25,26 +24,6 @@
 * Copyright 2013        M. Froeschle
 */

-#define ACR_BA(x)                   ((x) & 0xffff0000)
-#define ACR_ADMSK(x)                (((x) & 0xffff) << 16)
-#define ACR_E(x)                    (((x) & 1) << 15)
-
-#define ACR_S(x)                    (((x) & 3) << 13)
-#define ACR_S_USERMODE              0
-#define ACR_S_SUPERVISOR_MODE       1
-#define ACR_S_ALL                   2
-
-#define ACR_AMM(x)                  (((x) & 1) << 10)
-
-#define ACR_CM(x)                   (((x) & 3) << 5)
-#define ACR_CM_CACHEABLE_WT         0x0
-#define ACR_CM_CACHEABLE_CB         0x1
-#define ACR_CM_CACHE_INH_PRECISE    0x2
-#define ACR_CM_CACHE_INH_IMPRECISE  0x3
-
-#define ACR_SP(x)           (((x) & 1) << 3)
-#define ACR_W(x)            (((x) & 1) << 2)
-
 #include <stdint.h>
 #include "bas_printf.h"
 #include "bas_types.h"
@@ -63,14 +42,12 @@
 #error "unknown machine!"
 #endif /* MACHINE_FIREBEE */

-//#define DBG_MMU
+#define DBG_MMU
 #ifdef DBG_MMU
-#define dbg(format, arg...) do { xprintf("DEBUG (%s()): " format, __FUNCTION__, ##arg);} while(0)
+#define dbg(format, arg...) do { xprintf("DEBUG %s(): " format, __FUNCTION__, ##arg);} while(0)
 #else
 #define dbg(format, arg...) do {;} while (0)
 #endif /* DBG_MMU */
-#define err(format, arg...) do { xprintf("ERROR (%s()): " format, __FUNCTION__, ##arg); xprintf("system halted\r\n"); } while(0); while(1)
-

 /*
 * set ASID register
@@ -85,7 +62,7 @@ inline uint32_t set_asid(uint32_t value)
 			"movec		%[value],ASID\n\t"
 			: /* no output */
 			: [value] "r" (value)
-        : "memory"
+			:
 			);

 	rt_asid = value;
@@ -107,7 +84,7 @@ inline uint32_t set_acr0(uint32_t value)
 			"movec		%[value],ACR0\n\t"
 			: /* not output */
 			: [value] "r" (value)
-        : "memory"
+			:
 			);
 	rt_acr0 = value;

@@ -127,7 +104,7 @@ inline uint32_t set_acr1(uint32_t value)
 			"movec		%[value],ACR1\n\t"
 			: /* not output */
 			: [value] "r" (value)
-        : "memory"
+			:
 			);
 	rt_acr1 = value;

@@ -148,7 +125,7 @@ inline uint32_t set_acr2(uint32_t value)
 			"movec		%[value],ACR2\n\t"
 			: /* not output */
 			: [value] "r" (value)
-        : "memory"
+			:
 			);
 	rt_acr2 = value;

@@ -168,7 +145,7 @@ inline uint32_t set_acr3(uint32_t value)
 			"movec		%[value],ACR3\n\t"
 			: /* not output */
 			: [value] "r" (value)
-        : "memory"
+			:
 			);
 	rt_acr3 = value;

@@ -184,7 +161,7 @@ inline uint32_t set_mmubar(uint32_t value)
 			"movec		%[value],MMUBAR\n\t"
 			: /* no output */
 			: [value] "r" (value)
-        : "memory"
+			: /* no clobber */
 			);
 	rt_mmubar = value;
 	NOP();
@@ -192,527 +169,364 @@ inline uint32_t set_mmubar(uint32_t value)
 	return ret;
 }

+
+
 /*
- * translation table for virtual address ranges. Holds the physical_offset (which must be added to a virtual
- * address to get its physical counterpart) for memory ranges.
+ * TODO: this would be nicer in an include file
 */
-struct virt_to_phys
+extern uint8_t _SYS_SRAM[];
+#define SYS_SRAM_ADDRESS ((uint32_t) &_SYS_SRAM[0])
+extern uint8_t _SYS_SRAM_SIZE[];
+extern uint8_t _FASTRAM_END[];
+
+struct mmu_mapping
 {
-    uint32_t start_address;
+	uint32_t phys;
+	uint32_t virt;
 	uint32_t length;
-    uint32_t physical_offset;
+	uint32_t pagesize;
+	struct map_flags flags;
 };

-static struct virt_to_phys translation[] =
+static struct mmu_mapping locked_map[] =
 {
-    /* virtual  , length    , offset    */
-    { 0x00000000, 0x00e00000, 0x60000000 },     /* map first 14 MByte to first 14 Mb of video ram */
-    { 0x00e00000, 0x00100000, 0x00000000 },     /* map TOS to SDRAM */
-    { 0x00f00000, 0x00100000, 0xff000000 },     /* map Falcon I/O area to FPGA */
-    { 0x01000000, 0x1f000000, 0x00000000 },     /* map rest of ram virt = phys */
+	{
+		/* Falcon video memory. Needs special care */
+		0x60d00000,
+		0xd00000,
+		0x100000,
+		MMU_PAGE_SIZE_1M,
+		{ CACHE_WRITETHROUGH, SV_USER, SCA_PAGE_ID, ACCESS_READ | ACCESS_WRITE | ACCESS_EXECUTE },
+	},
 };
-static int num_translations = sizeof(translation) / sizeof(struct virt_to_phys);

-static inline uint32_t lookup_phys(uint32_t virt)
+static int num_locked_mmu_maps = sizeof(locked_map) / sizeof(struct mmu_mapping);
+
+static struct mmu_mapping memory_map[] =
+{
+	/* map OS system vectors supervisor-protected */
+	{
+		0,
+		0,
+		0x800,
+		MMU_PAGE_SIZE_1K,
+		{ CACHE_WRITETHROUGH, SV_PROTECT, 0, ACCESS_READ | ACCESS_WRITE | ACCESS_EXECUTE },
+	},
+	{
+		0x800,
+		0x800,
+		0x800,
+		MMU_PAGE_SIZE_1K,
+		{ CACHE_WRITETHROUGH, SV_PROTECT, 0, ACCESS_READ | ACCESS_WRITE | ACCESS_EXECUTE },
+	},
+	{
+		/* when the first 4k are filled with 1k pages, we can switch to 8k pages */
+		0x1000,
+		0x1000,
+		0xff000,
+		MMU_PAGE_SIZE_8K,
+		{ CACHE_WRITETHROUGH, SV_USER, 0, ACCESS_READ | ACCESS_WRITE | ACCESS_EXECUTE },
+	},
+	{
+		/* arrived at a 1Meg border, we can switch to 1Meg pages */
+		0x100000,
+		0x100000,
+		0xc00000,
+		MMU_PAGE_SIZE_1M,
+		{ CACHE_WRITETHROUGH, SV_USER, 0, ACCESS_READ | ACCESS_WRITE | ACCESS_EXECUTE },
+	},
+	/* Falcon video ram left out intentionally here (see above) */
+	{
+		/* ROM */
+		0xe00000,
+		0xe00000,
+		0x100000,
+		MMU_PAGE_SIZE_1M,
+		{ CACHE_WRITETHROUGH, SV_USER, 0, ACCESS_READ | ACCESS_EXECUTE },
+	},
+	{
+		/* FASTRAM */
+		0x1000000,
+		0x1000000,
+		(uint32_t) _FASTRAM_END - 0x1000000,
+		MMU_PAGE_SIZE_1M,
+		{ CACHE_WRITETHROUGH, SV_USER, 0, ACCESS_READ | ACCESS_WRITE | ACCESS_EXECUTE },
+	},
+	{
+		/* MBAR */
+		MBAR_ADDRESS,
+		MBAR_ADDRESS,
+		0x100000,
+		MMU_PAGE_SIZE_1M,
+		{ CACHE_NOCACHE_PRECISE, SV_PROTECT, 0, ACCESS_READ | ACCESS_WRITE },
+	},
+	{
+		/* RAMBAR0 */
+		RAMBAR0_ADDRESS,
+		RAMBAR0_ADDRESS,
+		(uint32_t) _RAMBAR0_SIZE,
+		MMU_PAGE_SIZE_1K,
+		{ CACHE_WRITETHROUGH, SV_PROTECT, 0, ACCESS_READ | ACCESS_WRITE | ACCESS_EXECUTE },
+	},
+	{
+		/* RAMBAR1 */
+		RAMBAR1_ADDRESS,
+		RAMBAR1_ADDRESS,
+		(uint32_t) _RAMBAR1_SIZE,
+		MMU_PAGE_SIZE_1K,
+		{ CACHE_WRITETHROUGH, SV_PROTECT, 0, ACCESS_READ | ACCESS_WRITE | ACCESS_EXECUTE },
+	},
+	{
+		/* SYSTEM SRAM */
+		SYS_SRAM_ADDRESS,
+		SYS_SRAM_ADDRESS,
+		(uint32_t) _SYS_SRAM_SIZE,
+		MMU_PAGE_SIZE_8K,
+		{ CACHE_WRITETHROUGH, SV_PROTECT, 0, ACCESS_READ | ACCESS_WRITE | ACCESS_EXECUTE },
+	},
+	{
+		/* Firebee FPGA registers */
+		(uint32_t) 0xf0000000,
+		(uint32_t) 0xf0000000,
+		(uint32_t) 0x08000000,
+		MMU_PAGE_SIZE_1M,
+		{ CACHE_NOCACHE_PRECISE, SV_PROTECT, 0, ACCESS_READ | ACCESS_WRITE },
+	},
+	{
+		/* Falcon I/O registers */
+		(uint32_t) 0xfff00000,
+		(uint32_t) 0xfff00000,
+		(uint32_t) 0x100000,
+		MMU_PAGE_SIZE_1M,
+		{ CACHE_NOCACHE_PRECISE, SV_PROTECT, 0, ACCESS_READ | ACCESS_WRITE },
+	},
+	{
+		/* the same, but different virtual address */
+		(uint32_t) 0x00f00000,
+		(uint32_t) 0xfff00000,
+		(uint32_t) 0x100000,
+		MMU_PAGE_SIZE_1M,
+		{ CACHE_NOCACHE_PRECISE, SV_PROTECT, 0, ACCESS_READ | ACCESS_WRITE },
+	},
+	{
+		/* PCI memory */
+		(uint32_t) PCI_MEMORY_OFFSET,
+		(uint32_t) PCI_MEMORY_OFFSET,
+		(uint32_t) PCI_MEMORY_SIZE,
+		MMU_PAGE_SIZE_1M,
+		{ CACHE_NOCACHE_PRECISE, SV_PROTECT, 0, ACCESS_READ | ACCESS_WRITE },
+	},
+	{
+		/* PCI I/O */
+		(uint32_t) PCI_IO_OFFSET,
+		(uint32_t) PCI_IO_OFFSET,
+		(uint32_t) PCI_IO_SIZE,
+		MMU_PAGE_SIZE_1M,
+		{ CACHE_NOCACHE_PRECISE, SV_PROTECT, 0, ACCESS_READ | ACCESS_WRITE },
+	}
+};
+
+static int num_mmu_maps = sizeof(memory_map) / sizeof(struct mmu_mapping);
+
+static struct mmu_mapping *lookup_mapping(uint32_t virt)
 {
 	int i;

-    for (i = 0; i < num_translations; i++)
-    {
-        if (virt >= translation[i].start_address && virt < translation[i].start_address + translation[i].length)
-        {
-            return virt + translation[i].physical_offset;
-        }
-    }
-    err("virtual address 0x%lx not found in translation table!\r\n", virt);
-    return -1;
-}
-
-struct page_descriptor
-{
-    uint8_t cache_mode          : 2;
-    uint8_t supervisor_protect  : 1;
-    uint8_t read                : 1;
-    uint8_t write               : 1;
-    uint8_t execute             : 1;
-    uint8_t global              : 1;
-    uint8_t locked              : 1;
-};
-
-static struct page_descriptor pages[65536];   /* 512 Mb RAM */
-
 	/*
- * map a page of memory using virt addresses with the Coldfire MMU.
- *
- * Theory of operation: the Coldfire MMU in the Firebee has 64 TLB entries, 32 for data (DTLB), 32 for
- * instructions (ITLB). Mappings can either be done locked (normal MMU TLB misses will not consider them
- * for replacement) or unlocked (mappings will reallocate using a LRU scheme when the MMU runs out of
- * TLB entries). For proper operation, the MMU needs at least two ITLBs and/or four free/allocatable DTLBs
- * per instruction as a minimum, more for performance. Thus locked pages (that can't be touched by the
- * LRU algorithm) should be used sparsingly.
- *
- *
- */
-int mmu_map_8k_page(uint32_t virt, uint8_t asid)
-{
-    const uint32_t size_mask = 0xffffe000;                      /* 8k pagesize */
-    int page_index = (virt & size_mask) / DEFAULT_PAGE_SIZE;	/* index into page_descriptor array */
-    struct page_descriptor *page = &pages[page_index];          /* attributes of page to map */
-
-    uint32_t phys = lookup_phys(virt);                          /* virtual to physical translation of page */
-
-    if (phys == -1)
-        return 0;
-
-#ifdef DBG_MMU
-    register int sp asm("sp");
-    dbg("page_descriptor: 0x%02x, ssp = 0x%08x\r\n", * (uint8_t *) page, sp);
-#endif /* DBG_MMU */
-    /*
-     * add page to TLB
-     */
-    MCF_MMU_MMUTR = (virt & 0xfffffc00) |                           /* virtual address */
-        MCF_MMU_MMUTR_ID(asid) |        							/* address space id (ASID) */
-        (page->global ? MCF_MMU_MMUTR_SG : 0) |						/* shared global */
-        MCF_MMU_MMUTR_V;											/* valid */
-
-    MCF_MMU_MMUDR = (phys & 0xfffffc00) |                 			/* physical address */
-        MCF_MMU_MMUDR_SZ(MMU_PAGE_SIZE_8K) |						/* page size */
-        MCF_MMU_MMUDR_CM(page->cache_mode) |                        /* cache mode */
-        (page->supervisor_protect ? MCF_MMU_MMUDR_SP : 0) |         /* supervisor protect */
-        (page->read ? MCF_MMU_MMUDR_R : 0) |                    	/* read access enable */
-        (page->write ? MCF_MMU_MMUDR_W : 0) |                       /* write access enable */
-        (page->execute ? MCF_MMU_MMUDR_X : 0) |                     /* execute access enable */
-        (page->locked ? MCF_MMU_MMUDR_LK : 0);
-
-    MCF_MMU_MMUOR = MCF_MMU_MMUOR_ITLB | 	/* instruction */
-        MCF_MMU_MMUOR_ACC |     			/* access TLB */
-        MCF_MMU_MMUOR_UAA;      			/* update allocation address field */
-    dbg("ITLB: MCF_MMU_MMUOR = %08x\r\n", MCF_MMU_MMUOR);
-
-    MCF_MMU_MMUOR = MCF_MMU_MMUOR_ACC |		/* access TLB, data */
-        MCF_MMU_MMUOR_UAA;					/* update allocation address field */
-
-    dbg("mapped virt=0x%08x to phys=0x%08x\r\n", virt & size_mask, phys & size_mask);
-
-    dbg("DTLB: MCF_MMU_MMUOR = %08x\r\n", MCF_MMU_MMUOR);
-
-    return 1;
-}
-
-int mmu_map_8k_instruction_page(uint32_t virt, uint8_t asid)
-{
-    const uint32_t size_mask = ~ (DEFAULT_PAGE_SIZE - 1);       /* 8k pagesize */
-    int page_index = (virt & size_mask) / DEFAULT_PAGE_SIZE;	/* index into page_descriptor array */
-    struct page_descriptor *page = &pages[page_index];          /* attributes of page to map */
-    int ipl;
-    uint32_t phys = lookup_phys(virt);                          /* virtual to physical translation of page */
-
-    if (phys == -1)
-        return 0;
-
-#ifdef DBG_MMU
-    register int sp asm("sp");
-    dbg("page_descriptor: 0x%02x, ssp = 0x%08x\r\n", * (uint8_t *) page, sp);
-#endif /* DBG_MMU */
-
-    /*
-     * add page to TLB
+	 * dumb, for now
 	 */

-    ipl = set_ipl(7);                                               /* do not disturb */
-
-    MCF_MMU_MMUAR = (virt & size_mask);
-
-    MCF_MMU_MMUTR = (virt & size_mask) |                            /* virtual address */
-        MCF_MMU_MMUTR_ID(asid) |        							/* address space id (ASID) */
-        (page->global ? MCF_MMU_MMUTR_SG : 0) |						/* shared global */
-        MCF_MMU_MMUTR_V;											/* valid */
-
-    __asm__ __volatile("" : : : "memory");                          /* MMU commands must be exactly in sequence */
-
-    MCF_MMU_MMUDR = (phys & size_mask) |                 			/* physical address */
-        MCF_MMU_MMUDR_SZ(MMU_PAGE_SIZE_8K) |						/* page size */
-        MCF_MMU_MMUDR_CM(page->cache_mode) |                        /* cache mode */
-        (page->supervisor_protect ? MCF_MMU_MMUDR_SP : 0) |         /* supervisor protect */
-        (page->read ? MCF_MMU_MMUDR_R : 0) |                    	/* read access enable */
-        (page->write ? MCF_MMU_MMUDR_W : 0) |                       /* write access enable */
-        (page->execute ? MCF_MMU_MMUDR_X : 0) |                     /* execute access enable */
-        (page->locked ? MCF_MMU_MMUDR_LK : 0);
-
-    __asm__ __volatile("" : : : "memory");                          /* MMU commands must be exactly in sequence */
-
-    MCF_MMU_MMUOR = MCF_MMU_MMUOR_ITLB | 	/* instruction */
-        MCF_MMU_MMUOR_ACC |     			/* access TLB */
-        MCF_MMU_MMUOR_UAA;      			/* update allocation address field */
-
-    __asm__ __volatile("" : : : "memory");                          /* MMU commands must be exactly in sequence */
-
-    set_ipl(ipl);
-
-    dbg("mapped virt=0x%08x to phys=0x%08x\r\n", virt & size_mask, phys & size_mask);
-
-    dbg("ITLB: MCF_MMU_MMUOR = %08x\r\n", MCF_MMU_MMUOR);
-    return 1;
-}
-
-int mmu_map_8k_data_page(uint32_t virt, uint8_t asid)
+	for (i = 0; i < num_mmu_maps; i++)
 	{
-    uint16_t ipl;
-    const uint32_t size_mask = ~ (DEFAULT_PAGE_SIZE - 1);       /* 8k pagesize */
-    int page_index = (virt & size_mask) / DEFAULT_PAGE_SIZE;	/* index into page_descriptor array */
-    struct page_descriptor *page = &pages[page_index];          /* attributes of page to map */
-
-    uint32_t phys = lookup_phys(virt);                          /* virtual to physical translation of page */
-
-    if (phys == -1)
-        return 0;
-
-#ifdef DBG_MMU
-    register int sp asm("sp");
-    dbg("page_descriptor: 0x%02x, ssp = 0x%08x\r\n", * (uint8_t *) page, sp);
-#endif /* DBG_MMU */
-
-    /*
-     * add page to TLB
-     */
-
-    ipl = set_ipl(7);                                               /* do not disturb */
-
-    MCF_MMU_MMUTR = (virt & size_mask) |                            /* virtual address */
-        MCF_MMU_MMUTR_ID(asid) |        							/* address space id (ASID) */
-        (page->global ? MCF_MMU_MMUTR_SG : 0) |						/* shared global */
-        MCF_MMU_MMUTR_V;											/* valid */
-
-    MCF_MMU_MMUDR = (phys & size_mask) |                 			/* physical address */
-        MCF_MMU_MMUDR_SZ(MMU_PAGE_SIZE_8K) |						/* page size */
-        MCF_MMU_MMUDR_CM(page->cache_mode) |                        /* cache mode */
-        (page->supervisor_protect ? MCF_MMU_MMUDR_SP : 0) |         /* supervisor protect */
-        (page->read ? MCF_MMU_MMUDR_R : 0) |                    	/* read access enable */
-        (page->write ? MCF_MMU_MMUDR_W : 0) |                       /* write access enable */
-        (page->execute ? MCF_MMU_MMUDR_X : 0) |                     /* execute access enable */
-        (page->locked ? MCF_MMU_MMUDR_LK : 0);
-
-    MCF_MMU_MMUOR = MCF_MMU_MMUOR_ACC |		/* access TLB, data */
-        MCF_MMU_MMUOR_UAA;					/* update allocation address field */
-
-    set_ipl(ipl);
-    dbg("mapped virt=0x%08x to phys=0x%08x\r\n", virt & size_mask, phys & size_mask);
-
-    dbg("DTLB: MCF_MMU_MMUOR = %08x\r\n", MCF_MMU_MMUOR);
-
-    return 1;
+		if (virt >= memory_map[i].virt && virt <= memory_map[i].virt + memory_map[i].length - 1)
+			return &memory_map[i];
 	}
-
-/*
- * map a page of memory using virt and phys as addresses with the Coldfire MMU.
- *
- * Theory of operation: the Coldfire MMU in the Firebee has 64 TLB entries, 32 for data (DTLB), 32 for
- * instructions (ITLB). Mappings can either be done locked (normal MMU TLB misses will not consider them
- * for replacement) or unlocked (mappings will reallocate using a LRU scheme when the MMU runs out of
- * TLB entries). For proper operation, the MMU needs at least two ITLBs and/or four free/allocatable DTLBs
- * per instruction as a minimum, more for performance. Thus locked pages (that can't be touched by the
- * LRU algorithm) should be used sparsingly.
- *
- *
- */
-int mmu_map_page(uint32_t virt, uint32_t phys, enum mmu_page_size sz, uint8_t page_id, const struct page_descriptor *flags)
-{
-    int size_mask;
-    int ipl;
-
-    switch (sz)
-    {
-        case MMU_PAGE_SIZE_1M:
-            size_mask = ~ (0x00010000 - 1);
-            break;
-
-        case MMU_PAGE_SIZE_8K:
-            size_mask = ~ (0x2000 - 1);
-            break;
-
-        case MMU_PAGE_SIZE_4K:
-            size_mask = ~ (0x1000 - 1);
-            break;
-
-        case MMU_PAGE_SIZE_1K:
-            size_mask = ~ (0x400 - 1);
-            break;
-
-        default:
-            err("illegal map size %d\r\n", sz);
-    }
-
-    /*
-     * add page to TLB
-     */
-
-    ipl = set_ipl(7);
-
-    MCF_MMU_MMUTR = ((uint32_t) virt & size_mask) |					/* virtual address */
-        MCF_MMU_MMUTR_ID(page_id) |                                 /* address space id (ASID) */
-        (flags->global ? MCF_MMU_MMUTR_SG : 0) |					/* shared global */
-        MCF_MMU_MMUTR_V;											/* valid */
-    NOP();
-
-    MCF_MMU_MMUDR = ((uint32_t) phys & size_mask) |					/* physical address */
-        MCF_MMU_MMUDR_SZ(sz) |										/* page size */
-        MCF_MMU_MMUDR_CM(flags->cache_mode) |
-        (flags->read ? MCF_MMU_MMUDR_R : 0) |                       /* read access enable */
-        (flags->write ? MCF_MMU_MMUDR_W : 0) |                      /* write access enable */
-        (flags->execute ? MCF_MMU_MMUDR_X : 0) |                    /* execute access enable */
-        (flags->locked ? MCF_MMU_MMUDR_LK : 0);
-    NOP();
-
-    MCF_MMU_MMUOR = MCF_MMU_MMUOR_ACC |		/* access TLB, data */
-        MCF_MMU_MMUOR_UAA;					/* update allocation address field */
-    NOP();
-
-    MCF_MMU_MMUOR = MCF_MMU_MMUOR_ITLB | 	/* instruction */
-        MCF_MMU_MMUOR_ACC |     			/* access TLB */
-        MCF_MMU_MMUOR_UAA;      			/* update allocation address field */
-
-    set_ipl(ipl);
-
-    dbg("mapped virt=0x%08x to phys=0x%08x\r\n", virt, phys);
-
-    return 1;
+	return NULL;
 }

 void mmu_init(void)
 {
 	extern uint8_t _MMUBAR[];
 	uint32_t MMUBAR = (uint32_t) &_MMUBAR[0];
-    struct page_descriptor flags;
 	int i;

-    /*
-     * clear all MMU TLB entries first
-     */
-    MCF_MMU_MMUOR = MCF_MMU_MMUOR_CA;       /* clears _all_ TLBs (including locked ones) */
-    NOP();
+	set_asid(0);			/* do not use address extension (ASID provides virtual 48 bit addresses */

 	/*
-     * prelaminary initialization of page descriptor 0 (root) table
+	 * need to set data ACRs in a way that supervisor access to all memory regions
+	 * becomes possible. Otherways it might be that the supervisor stack ends up in an unmapped
+	 * region when further MMU TLB entries force a page steal. This would lead to a double
+	 * fault since the CPU wouldn't be able to push its exception stack frame during an access
+	 * exception
 	 */
-    for (i = 0; i < sizeof(pages) / sizeof(struct page_descriptor); i++)
-    {
-        uint32_t addr = i * DEFAULT_PAGE_SIZE;
-
-        if (addr >= 0x00f00000 && addr < 0x00ffffff)
-        {
-            pages[i].cache_mode = CACHE_NOCACHE_PRECISE;
-            pages[i].execute = 0;
-            pages[i].read = 1;
-            pages[i].write = 1;
-            pages[i].execute = 0;
-            pages[i].global = 1;
-            pages[i].supervisor_protect = 1;
-        }
-        else if (addr >= 0x0 && addr < 0x00e00000)      /* ST-RAM, potential video memory */
-        {
-            pages[i].cache_mode = CACHE_WRITETHROUGH;
-            pages[i].execute = 1;
-            pages[i].supervisor_protect = 0;
-            pages[i].read = 1;
-            pages[i].write = 1;
-            pages[i].execute = 1;
-            pages[i].global = 1;
-        }
-        else if (addr >= 0x00e00000 && addr < 0x00f00000)      /* EmuTOS */
-        {
-            pages[i].cache_mode = CACHE_COPYBACK;
-            pages[i].execute = 1;
-            pages[i].supervisor_protect = 1;
-            pages[i].read = 1;
-            pages[i].write = 0;
-            pages[i].execute = 1;
-            pages[i].global = 1;
-        }
-        else
-        {
-            pages[i].cache_mode = CACHE_COPYBACK;
-            pages[i].execute = 1;
-            pages[i].read = 1;
-            pages[i].write = 1;
-            pages[i].supervisor_protect = 0;
-            pages[i].global = 1;
-        }
-        pages[i].locked = 0;				/* not locked */
-        pages[0].supervisor_protect = 0;    /* protect system vectors */
-    }
-
-    set_asid(0);			/* do not use address extension (ASID provides virtual 48 bit addresses) yet */
-

 	/* set data access attributes in ACR0 and ACR1 */
-    set_acr0(ACR_W(0) |								/* read and write accesses permitted */
-            ACR_SP(0) |								/* supervisor and user mode access permitted */
-            ACR_CM(ACR_CM_CACHE_INH_PRECISE) |		/* cache inhibit, precise (i/o area!) */
-            ACR_AMM(0) |							/* control region > 16 MB */
-            ACR_S(ACR_S_ALL) |						/* match addresses in user and supervisor mode */
+
+	set_acr0(ACR_WRITE_PROTECT(0) |			/* read and write accesses permitted */
+			ACR_SUPERVISOR_PROTECT(0) |		/* supervisor and user mode access permitted */
+			ACR_CACHE_MODE(CACHE_WRITETHROUGH) |	/* cacheable, write through */
+			ACR_ADDRESS_MASK_MODE(1) | 		/* region 13 MByte */
+			ACR_S(ACR_S_SUPERVISOR_MODE) |	/* memory only visible from supervisor mode */
 			ACR_E(1) |						/* enable ACR */
-#if defined(MACHINE_FIREBEE)
-            ACR_ADMSK(0x7f) |						/* cover 2GB area from 0x80000000 to 0xffffffff */
-            ACR_BA(0x80000000));					/* (equals area from 3 to 4 GB */
-#elif defined(MACHINE_M5484LITE)
-            ACR_ADMSK(0x7f) |						/* cover 2 GB area from 0x80000000 to 0xffffffff */
-            ACR_BA(0x80000000));
-#elif defined(MACHINE_M54455)
-            ACR_ADMSK(0x7f) |
-            ACR_BA(0x80000000));					/* FIXME: not determined yet for this machine */
-#else
-#error unknown machine!
-#endif /* MACHINE_FIREBEE */
+			ACR_ADMSK(0x0a) |				/* cover 12 MByte from 0x0 */
+			ACR_BA(0));						/* start from 0x0 */
+
+	set_acr1(ACR_WRITE_PROTECT(0) |			/* read and write accesses permitted */
+			ACR_SUPERVISOR_PROTECT(0) |		/* supervisor and user mode access permitted */
+			ACR_CACHE_MODE(CACHE_WRITETHROUGH) |	/* cacheable, write through */
+			ACR_ADDRESS_MASK_MODE(0) | 		/* region > 16 MByte */
+			ACR_S(ACR_S_SUPERVISOR_MODE) |	/* memory only visible from supervisor mode */
+			ACR_E(1) |						/* enable ACR */
+			ACR_ADMSK(0x1f) |				/* cover 495 MByte from 0x1000000 */
+			ACR_BA(0x01000000));			/* all Fast RAM */


+	/*
+	 * set instruction access attributes in ACR2 and ACR3. This is the same as above, basically:
+	 * enable supervisor access to all SDRAM
+	 */

-    // set_acr1(0x601fc000);
-    set_acr1(ACR_W(0) |
-            ACR_SP(0) |
-            ACR_CM(0) |
-#if defined(MACHINE_FIREBEE)
-            ACR_CM(ACR_CM_CACHE_INH_PRECISE) |		/* ST RAM on the Firebee */
-#elif defined(MACHINE_M5484LITE)
-            ACR_CM(ACR_CM_CACHE_INH_PRECISE) |		/* Compact Flash on the M548xLITE */
-#elif defined(MACHINE_M54455)
-            ACR_CM(ACR_CM_CACHE_INH_PRECISE) |		/* FIXME: not determined yet for this machine */
-#else
-#error unknown machine!
-#endif /* MACHINE_FIREBEE */
-            ACR_AMM(0) |
-            ACR_S(ACR_S_ALL) |
+	set_acr2(ACR_WRITE_PROTECT(0) |
+			ACR_SUPERVISOR_PROTECT(0) |
+			ACR_CACHE_MODE(CACHE_WRITETHROUGH) |
+			ACR_ADDRESS_MASK_MODE(1) |
+			ACR_S(ACR_S_SUPERVISOR_MODE) |
 			ACR_E(1) |
-            ACR_ADMSK(0x7f) |
-            ACR_BA(0x00100000));
+			ACR_ADMSK(0x0c) |
+			ACR_BA(0x0));

-#ifdef _NOT_USED_
-    /* set instruction access attributes in ACR2 and ACR3 */
-
-    //set_acr2(0xe007c400);							/* flash area */
-    set_acr2(ACR_W(0) |
-            ACR_SP(0) |
-            ACR_CM(0) |
-            ACR_CM(ACR_CM_CACHE_INH_PRECISE) |
-            ACR_AMM(1) |
-            ACR_S(ACR_S_ALL) |
+	set_acr3(ACR_WRITE_PROTECT(0) |
+			ACR_SUPERVISOR_PROTECT(0) |
+			ACR_CACHE_MODE(CACHE_WRITETHROUGH) |
+			ACR_ADDRESS_MASK_MODE(0) |
+			ACR_S(ACR_S_SUPERVISOR_MODE) |
 			ACR_E(1) |
-            ACR_ADMSK(0x7) |
-            ACR_BA(0xe0000000));
-#endif /* _NOT_USED_ */
-
-    set_acr1(0x0);
-    set_acr2(0x0);
-    /* disable ACR3 */
-    set_acr3(0x0);
+			ACR_ADMSK(0x1f) |
+			ACR_BA(0x0f));

 	set_mmubar(MMUBAR + 1);		/* set and enable MMUBAR */

 	/* clear all MMU TLB entries */
 	MCF_MMU_MMUOR = MCF_MMU_MMUOR_CA;

-    /* create locked TLB entries */
+	/* map locked TLB entries */
+	for (i = 0; i < num_locked_mmu_maps; i++)
+	{
+		mmu_map_page(locked_map[i].virt, locked_map[i].phys, locked_map->pagesize, locked_map->flags);

-    /*
-     * Map (locked) the second last MB of physical SDRAM (this is where BaS .data and .bss reside) to the same
-     * virtual address. This is also used (completely) when BaS is in RAM
-     */
-    flags.cache_mode = CACHE_NOCACHE_PRECISE;
-    flags.read = 1;
-    flags.write = 1;
-    flags.execute = 1;
-    flags.supervisor_protect = 1;		/* supervisor access only */
-    flags.locked = 1;
-    mmu_map_page(SDRAM_START + SDRAM_SIZE - 0x00200000, SDRAM_START + SDRAM_SIZE - 0x00200000, 0, MMU_PAGE_SIZE_1M, &flags);
-
-    /*
-     * map EmuTOS (locked for now)
-     */
-    flags.read = 1;
-    flags.write = 1;
-    flags.execute = 1;
-    flags.locked = 1;
-    //mmu_map_page(0xe00000, 0xe00000, MMU_PAGE_SIZE_1M, 0, &flags);
-
-    /*
-     * Map (locked) the very last MB of physical SDRAM (this is where the driver buffers reside) to the same
-     * virtual address. Used uncached for drivers.
-     */
-    flags.cache_mode = CACHE_NOCACHE_PRECISE;
-    flags.read = 1;
-    flags.write = 1;
-    flags.execute = 0;
-    flags.supervisor_protect = 1;
-    flags.locked = 1;
-    mmu_map_page(SDRAM_START + SDRAM_SIZE - 0x00100000, SDRAM_START + SDRAM_SIZE - 0x00100000, 0, MMU_PAGE_SIZE_1M, &flags);
+		if (locked_map[i].flags.page_id == SCA_PAGE_ID)
+		{
+			video_tlb = 0x2000;
+			video_sbt = 0x0;
+		}
+	}
 }

 /*
- * enable the MMU. The Coldfire MMU can be used in two different modes
- * ... FIXME:
+ * handle an access error
+ * upper level routine called from access_exception inside exceptions.S
 */
-void mmu_enable(void)
+bool access_exception(uint32_t pc, uint32_t format_status)
 {
-    MCF_MMU_MMUCR = MCF_MMU_MMUCR_EN;			/* MMU on */
-    NOP();                                      /* force pipeline sync */
-}
+	int fault_status;
+	uint32_t fault_address;
+	uint32_t mmu_status;

-#ifdef DBG_MMU
-void verify_mapping(uint32_t address)
+	/*
+	 * extract fault status from format_status exception stack field
+	 */
+	fault_status = format_status & 0xc030000;
+	mmu_status = MCF_MMU_MMUSR;
+
+	/*
+	 * determine if access fault was caused by a TLB miss
+	 */
+	switch (fault_status)
 	{
-    /* retrieve mapped page from MMU and make sure everything is correct */
-    int ds;
-
-    ds = * (int *) address;
-    dbg("found 0x%08x at address\r\n", ds);
-}
-#endif /* DBG_MMU */
-
-uint32_t mmutr_miss(uint32_t mmu_sr, uint32_t fault_address, uint32_t pc,
-                uint32_t format_status)
-{
-    uint32_t fault = format_status & 0x0c030000;
-
-    switch (fault)
-    {
-        /* if we have a real TLB miss, map the offending page */
-
-        case 0x04010000:    /* TLB miss on opword of instruction fetch */
-        case 0x04020000:    /* TLB miss on extension word of instruction fetch */
-            dbg("MMU ITLB MISS accessing 0x%08x\r\n"
-                "FS = 0x%08x\r\n"
-                "MMUSR = 0x%08x\r\n"
-                "PC = 0x%08x\r\n",
-                fault_address, format_status, mmu_sr, pc);
-            dbg("fault = 0x%08x\r\n", fault);
-            mmu_map_8k_instruction_page(pc, 0);
-
-            /* due to prefetch, it makes sense to map the next adjacent page also for ITLBs */
-            mmu_map_8k_instruction_page(pc + DEFAULT_PAGE_SIZE, 0);
+		case 0x4010000:	/* TLB miss on opword of instruction fetch */
+		case 0x4020000:	/* TLB miss on extension word of instruction fetch */
+			//fault_address = pc;
+			//break;
+		case 0x8020000:	/* TLB miss on data write */
+		case 0xc020000:	/* TLB miss on data read or read-modify-write */
+			fault_address = MCF_MMU_MMUAR;
+			/*
+			 * the following line must stay commented or we risk a double fault (debugging
+			 * output requiring itself a page mapping):
+			 */
+			// dbg("access fault - TLB miss at %p. Fault status = 0x0%x\r\n", pc, fault_status);
 			break;

-        case 0x08020000:    /* TLB miss on data write */
-        case 0x0c020000:    /* TLB miss on data read or read-modify-write */
-            dbg("MMU DTLB MISS accessing 0x%08x\r\n"
-                "FS = 0x%08x\r\n"
-                "MMUSR = 0x%08x\r\n"
-                "PC = 0x%08x\r\n",
-                fault_address, format_status, mmu_sr, pc);
-            dbg("fault = 0x%08x\r\n", fault);
-            mmu_map_8k_data_page(fault_address, 0);
-            break;
-
-        /* else issue an bus error */
 		default:
-            dbg("bus error\r\n");
-            return 1;       /* signal bus error to caller */
+			return false;
 	}

-#ifdef DBG_MMU
-    xprintf("\r\n");
-#endif /* DBG_MMU */

-    return 0;   /* signal TLB miss handled to caller */
+	if (mmu_status & MCF_MMU_MMUSR_HIT)		/* did the last fault hit in TLB? */
+	{
+		/*
+		 * if yes, then we already mapped that page during a previous turn and this is in fact a bus error
+		 */
+		return false;
+	}
+	else
+	{
+		struct mmu_mapping *map;
+
+
+		if ((map = lookup_mapping(fault_address)) != NULL)
+		{
+			uint32_t mask;
+
+			switch (map->pagesize)
+			{
+				case MMU_PAGE_SIZE_1M:
+					mask = ~(0x100000 - 1);
+					break;
+				case MMU_PAGE_SIZE_4K:
+					mask = ~(0x1000 - 1);
+					break;
+				case MMU_PAGE_SIZE_8K:
+					mask = ~(0x2000 - 1);
+					break;
+				case MMU_PAGE_SIZE_1K:
+					mask = ~(0x400 - 1);
+					break;
+			}
+
+			mmu_map_page(fault_address & mask, fault_address & mask, map->pagesize, map->flags);
+			return true;
+		}
+	}
+	return false;
+}
+
+
+void mmu_map_page(uint32_t virt, uint32_t phys, uint32_t map_size, struct map_flags flags)
+{
+
+	/*
+	 * add page to TLB
+	 */
+	MCF_MMU_MMUTR = virt |					/* virtual address */
+		MCF_MMU_MMUTR_ID(flags.page_id) |
+		MCF_MMU_MMUTR_SG |					/* shared global */
+		MCF_MMU_MMUTR_V;					/* valid */
+
+	MCF_MMU_MMUDR = phys |					/* physical address */
+		MCF_MMU_MMUDR_SZ(map_size) |		/* 1 MB page size */
+		MCF_MMU_MMUDR_CM(flags.cache_mode) |
+		(flags.access & ACCESS_READ ? MCF_MMU_MMUDR_R : 0) |		/* read access enable */
+		(flags.access & ACCESS_WRITE ? MCF_MMU_MMUDR_W : 0) |		/* write access enable */
+		(flags.access & ACCESS_EXECUTE ? MCF_MMU_MMUDR_X : 0);		/* execute access enable */
+
+	MCF_MMU_MMUOR = MCF_MMU_MMUOR_ACC |		/* access TLB, data */
+		MCF_MMU_MMUOR_UAA;					/* update allocation address field */
+
+	MCF_MMU_MMUOR = MCF_MMU_MMUOR_ITLB | 	/* instruction */
+		MCF_MMU_MMUOR_ACC |     			/* access TLB */
+		MCF_MMU_MMUOR_UAA;      			/* update allocation address field */
+	dbg("mapped virt=%p to phys=%p\r\n", virt, phys);
 }


--- a/sys/startcf.S
+++ b/sys/startcf.S
@@ -49,8 +49,6 @@ _rom_entry:
 		/* set stack pointer to end of SRAM */
 		lea 	__SUP_SP,a7
 		move.l	#0,(sp)
-		subq.l	#4,sp
-		move.l	#0,(sp)

 		/*
 		 * Initialize the processor caches.
--- a/sys/sysinit.c
+++ b/sys/sysinit.c
@@ -55,13 +55,6 @@
 #include "usb.h"
 #include "video.h"

-// #define DEBUG_SYSINIT
-#ifdef DEBUG_SYSINIT
-#define dbg(format, arg...) do { xprintf("DEBUG: %s(): " format, __FUNCTION__, ##arg); } while (0)
-#else
-#define dbg(format, arg...) do { ; } while (0)
-#endif /* DEBUG_SYSINIT */
-
 #define UNUSED(x) (void)(x)				/* Unused variable         */

 bool fpga_configured = false;			/* for FPGA JTAG configuration */
@@ -251,7 +244,7 @@ void init_serial(void)
 	MCF_PSC0_PSCOPSET = 0x01;
 	MCF_PSC0_PSCCR = 0x05;

-#if defined(MACHINE_FIREBEE)	/* PSC3 is not connected to anything on the LITE board */
+#ifdef MACHINE_FIREBEE	/* PSC3 is not connected to anything on the LITE board */
 	/* PSC3: PIC */
 	MCF_PSC3_PSCSICR = 0;	// UART
 	MCF_PSC3_PSCCSR = 0xDD;
@@ -487,123 +480,12 @@ void wait_pll(void)
 	} while ((* (volatile int16_t *) 0xf0000800 < 0) && MCF_SLT0_SCNT > trgt);
 }

-
-volatile uint8_t *pll_base = (volatile uint8_t *) 0xf0000600;
-
-//#define _OLD_CODE_ /* use old PLL initialization code */
-#ifndef _OLD_CODE_
-
-/*
- * the altpll_reconfig component is connected to the Bus as follows:
- *
- * 9 bit data:
- * 876543210 (this _is_ actually the last part of the address written or read!)
- * | ||  |
- * | |+--+- counter_type
- * +-+----- counter_param
- *
- * 9 bit data
- * 876543210
- * +-------+- data_in
- *
- * counter_type selects which counter should be affected by data_in:
- * 0000 - N
- * 0001 - M
- * 0010 - CP/LF (charge pump/loop filter)
- * 0011 - VCO (voltage controlled oscillator)
- * 0100 - C0
- * 0101 - C1
- * 0110 - C2
- * 0111 - C3
- * 1000 - C4
- *
- * counter_param selects which part of the selected counter_type is set/read and how many
- * bits are used/valid:
- *
- * for counter_type N, M, C0-C4:
- * 000 - high count, 8 bit
- * 001 - low count, 8 bit
- * 100 - bypass, 1 bit
- * 101 - mode (odd/even division), 1 bit
- *
- * for counter_type CP/LF:
- * 101 - charge pump unused, 5 bit
- * 000 - charge pump current, 3 bit
- * 100 - loop filter unused, 1 bit
- * 001 - loop filter resistor, 5 bit
- * 010 - loop filter capacitance, 2 bit
- *
- * for counter_type VCO:
- * 000 - VCO post scale, 1 bit
- */
-
-#define PLL_COUNTER_TYPE_N      0
-#define PLL_COUNTER_TYPE_M      1
-#define PLL_COUNTER_TYPE_CPLF   2
-#define PLL_COUNTER_TYPE_VCO    3
-#define PLL_COUNTER_TYPE_C0     4
-#define PLL_COUNTER_TYPE_C1     5
-#define PLL_COUNTER_TYPE_C2     6
-#define PLL_COUNTER_TYPE_C3     7
-#define PLL_COUNTER_TYPE_C4     8
-
-#define PLL_COUNTER_PARAM_HC    0
-#define PLL_COUNTER_PARAM_LC    1
-#define PLL_COUNTER_PARAM_BP    4
-#define PLL_COUNTER_PARAM_MODE  5
-
-#define PLL_COUNTER_PARAM_CP_U  5
-#define PLL_COUNTER_PARAM_CP_C  0
-#define PLL_COUNTER_PARAM_LF_U  4
-#define PLL_COUNTER_PARAM_LF_R  1
-#define PLL_COUNTER_PARAM_LF_C  2
-
-#define PLL_COUNTER_PARAM_VCO_PS    0
-
-void pll_write(int type, int param, int data)
-{
-	wait_pll();
-	* (volatile uint16_t *) (pll_base + ((param << 6) | (type << 2))) = data;
-}
-
-struct pll_init
-{
-	int type;
-	int param;
-	int data;
-};
-
-struct pll_init pll_values[] =
-{
-	{ PLL_COUNTER_TYPE_CPLF, PLL_COUNTER_PARAM_LF_R, 27 },	/* loopfilter R */
-	{ PLL_COUNTER_TYPE_CPLF, PLL_COUNTER_PARAM_LF_C, 1 },	/* charge pump 1 */
-	{ PLL_COUNTER_TYPE_N, PLL_COUNTER_PARAM_HC, 12 },		/* N counter high */
-	{ PLL_COUNTER_TYPE_N, PLL_COUNTER_PARAM_LC, 12 },		/* N counter low */
-	{ PLL_COUNTER_TYPE_C1, PLL_COUNTER_PARAM_BP, 1 },		/* c1 bypass */
-	{ PLL_COUNTER_TYPE_C2, PLL_COUNTER_PARAM_BP, 1 },		/* c2 bypass */
-	{ PLL_COUNTER_TYPE_C3, PLL_COUNTER_PARAM_BP, 1 },		/* c3 bypass */
-	{ PLL_COUNTER_TYPE_C0, PLL_COUNTER_PARAM_HC, 1 },		/* c0 high */
-	{ PLL_COUNTER_TYPE_C0, PLL_COUNTER_PARAM_LC, 1 },		/* c0 low */
-	{ PLL_COUNTER_TYPE_M, PLL_COUNTER_PARAM_MODE, 1 },		/* M odd division */
-	{ PLL_COUNTER_TYPE_M, PLL_COUNTER_PARAM_LC, 1 },		/* M low = 1 */
-	{ PLL_COUNTER_TYPE_M, PLL_COUNTER_PARAM_HC, 145 }		/* M high = 145 = 146 MHz */
-};
-int num_pll_values = sizeof(pll_values) / sizeof(struct pll_init);
-#endif /* _OLD_CODE_ */
+static volatile uint8_t *pll_base = (volatile uint8_t *) 0xf0000600;

 void init_pll(void)
 {
-	int i;
-
 	xprintf("FPGA PLL initialization: ");

-#ifndef _OLD_CODE_
-	for (i = 0; i < num_pll_values; i++)
-	{
-		pll_write(pll_values[i].type, pll_values[i].param, pll_values[i].data);
-	}
-
-#else /* _OLD_CODE_ */
 	wait_pll();
 	* (volatile uint16_t *) (pll_base + 0x48) = 27;	/* loopfilter  r */

@@ -641,7 +523,6 @@ void init_pll(void)
 	* (volatile uint16_t *) (pll_base + 0x04) = 145;	/* M high = 145 = 146 MHz */

 	wait_pll();
-#endif /* _OLD_CODE_ */

 	* (volatile uint8_t *) 0xf0000800 = 0;				/* set */

@@ -681,7 +562,7 @@ void init_video_ddr(void) {
 	_VRAM = 0000070022;	/* load MR dll on */
 	NOP();

-	* (uint32_t *) 0xf0000400 = 0x01070002; /* fifo on, refresh on, ddrcs and cke on, video dac on */
+	* (uint32_t *) 0xf0000400 = 0x01070002; /* fifo on, refresh on, ddrcs und cke on, video dac on */

 	xprintf("finished\r\n");
 }
@@ -707,52 +588,41 @@ void init_usb(void)
 		if (handle > 0)
 		{
 			uint32_t id = 0;
-			uint32_t pci_class = 0;
+			uint32_t class = 0;

 			id = pci_read_config_longword(handle, PCIIDR);
-			pci_class = pci_read_config_longword(handle, PCIREV);
-			dbg("compare class code 0x%x to 0x%x\r\n", PCI_CLASS_CODE(pci_class), PCI_CLASS_SERIAL_USB);
-			if (PCI_CLASS_CODE(pci_class) == PCI_CLASS_SERIAL_USB)
+			class = pci_read_config_longword(handle, PCIREV);
+
+			if (PCI_CLASS_CODE(class) == PCI_CLASS_SERIAL_USB)
 			{
 				xprintf("serial USB found at bus=0x%x, dev=0x%x, fnc=0x%x (0x%x)\r\n",
 						PCI_BUS_FROM_HANDLE(handle),
 						PCI_DEVICE_FROM_HANDLE(handle),
 						PCI_FUNCTION_FROM_HANDLE(handle),
 						handle);
-				dbg("compare subclass code 0x%x against 0x%x\r\n", PCI_SUBCLASS(pci_class), PCI_CLASS_SERIAL_USB_EHCI);
-				if (PCI_SUBCLASS(pci_class) == PCI_CLASS_SERIAL_USB_EHCI)
+				if (PCI_SUBCLASS(class) == PCI_CLASS_SERIAL_USB_EHCI)
 				{
 					board = ehci_usb_pci_table;
 					while (board->vendor)
 					{
-						dbg("compare vendor id 0x%x against 0x%x\r\n", board->vendor, PCI_VENDOR_ID(id));
-						dbg("compare device id 0x%x against 0x%x\r\n", board->device, PCI_DEVICE_ID(id));
 						if ((board->vendor == PCI_VENDOR_ID(id)) && board->device == PCI_DEVICE_ID(id))
 						{
-#ifdef _NOT_YET_	/* FIXME: usb_init() is broken */
-							dbg("match. trying to init board\r\n");
 							if (usb_init(handle, board) >= 0)
 							{
 								usb_found++;
 							}
-#endif /* _NOT_YET_ */
 						}
 						board++;
 					}
 				}
-
-				dbg("compare subclass code 0x%x against 0x%x\r\n", PCI_SUBCLASS(pci_class), PCI_CLASS_SERIAL_USB_OHCI);
-				if (PCI_SUBCLASS(pci_class) == PCI_CLASS_SERIAL_USB_OHCI)
+				if (PCI_SUBCLASS(class) == PCI_CLASS_SERIAL_USB_OHCI)
 				{
 					board = ohci_usb_pci_table;
-
 					while (board->vendor)
 					{
-						dbg("matched. compare vendor id 0x%x against 0x%x\r\n", board->vendor, PCI_VENDOR_ID(id));
-						dbg("compare device id 0x%x against 0x%x\r\n", board->device, PCI_DEVICE_ID(id));
 						if ((board->vendor == PCI_VENDOR_ID(id)) && board->device == PCI_DEVICE_ID(id))
 						{
-							// if (usb_init(handle, board) >= 0)
+							if (usb_init(handle, board) >= 0)
 								usb_found++;
 						}
 						board++;
@@ -760,7 +630,6 @@ void init_usb(void)
 				}
 			}
 		}
-		dbg("PCI device handle = %x\r\n", handle);
 	} while (handle >= 0);

 	xprintf("finished (found %d USB controller(s))\r\n", usb_found);
@@ -1063,6 +932,8 @@ void clear_bss_segment(void)

 void initialize_hardware(void)
 {
+	bool coldboot = true;
+
 	/* Test for FireTOS switch: DIP switch #5 up */
 #ifdef MACHINE_FIREBEE
 	if (!(DIP_SWITCH & (1 << 6))) {
@@ -1106,9 +977,6 @@ void initialize_hardware(void)
 #endif
 	, MAJOR_VERSION, MINOR_VERSION, __DATE__, __TIME__);

-	extern char *rom_header;
-
-	xprintf("running from %p\r\n\r\n", &rom_header);
 	/*
 	 * Determine cause(s) of Reset
 	 */
@@ -1181,13 +1049,19 @@ void initialize_hardware(void)

 	init_slt();
 	init_fbcs();
-	init_ddram();
+	coldboot = init_ddram();

 	/*
 	 * install (preliminary) exception vectors
 	 */
 	setup_vectors();

+#ifdef _NOT_USED_
+	/* make sure the handlers are called */
+	__asm__ __volatile__("dc.w 0xafff");  /* should trigger a line-A exception */
+#endif /* _NOT_USED_ */
+
+
 	/*
 	 * save the planet (and reduce case heat): disable clocks of unused SOC modules
 	 */
@@ -1221,6 +1095,8 @@ void initialize_hardware(void)
 	}

 #if MACHINE_FIREBEE
+	if (coldboot) /* does not work with BDM */
+		;
 	fpga_configured = init_fpga();

 	init_pll();
@@ -1232,8 +1108,10 @@ void initialize_hardware(void)
 	init_pci();
 	video_init();

-	/* initialize USB devices */
-	init_usb();
+	/* do not try to init USB for now on the Firebee, it hangs the machine */
+#ifndef MACHINE_FIREBEE
+	//init_usb();
+#endif

 #if MACHINE_FIREBEE
 	init_ac97();
--- a/tos/Makefile
+++ b/tos/Makefile
@@ -1,11 +0,0 @@
-.PHONY: tos
-.PHONY: jtagwait
-.PHONY: mcdcook
-tos: jtagwait mcdcook
-
-jtagwait:
-	(cd $@; make)
-
-bascook:
-	(cd $@; make)
-	
--- a/tos/bascook/Makefile
+++ b/tos/bascook/Makefile
@@ -1,97 +0,0 @@
-CROSS=Y
-
-CROSSBINDIR_IS_Y=m68k-atari-mint-
-CROSSBINDIR_IS_N=
-
-CROSSBINDIR=$(CROSSBINDIR_IS_$(CROSS))
-
-UNAME := $(shell uname)
-ifeq ($(CROSS), Y)
-ifeq ($(UNAME),Linux)
-PREFIX=m68k-atari-mint
-HATARI=hatari
-else
-PREFIX=m68k-atari-mint
-HATARI=/usr/local/bin/hatari
-endif
-else
-PREFIX=/usr
-endif
-
-DEPEND=depend
-TOPDIR= ../..
-
-BAS_INCLUDE=-I$(TOPDIR)/../BaS_gcc/include
-
-INCLUDE=-I$(TOPDIR)/../libcmini/include $(BAS_INCLUDE) -nostdlib
-LIBS=-lcmini -nostdlib -lgcc
-CC=$(PREFIX)/bin/gcc
-
-CC=$(CROSSBINDIR)gcc
-STRIP=$(CROSSBINDIR)strip
-STACK=$(CROSSBINDIR)stack
-
-APP=bascook.prg
-TEST_APP=$(APP)
-
-CFLAGS=\
-	-Os\
-	-g\
-	-Wl,-Map,mapfile\
-	-Wall
-
-SRCDIR=sources
-
-CSRCS=\
-	$(SRCDIR)/bascook.c
-ASRCS=
-
-COBJS=$(patsubst $(SRCDIR)/%.o,%.o,$(patsubst %.c,%.o,$(CSRCS)))
-AOBJS=$(patsubst $(SRCDIR)/%.o,%.o,$(patsubst %.S,%.o,$(ASRCS)))
-OBJS=$(COBJS) $(AOBJS)
-
-TRGTDIRS=.
-OBJDIRS=$(patsubst %,%/objs,$(TRGTDIRS))
-
-#
-# multilib flags. These must match m68k-atari-mint-gcc -print-multi-lib output
-#
-$(APP):CFLAGS += -mcpu=5475
-
-all: $(TEST_APP)
-
-#
-# generate pattern rules for multilib object files.
-#
-define CC_TEMPLATE
-$(1)/objs/%.o:$(SRCDIR)/%.c
-	$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@
-
-$(1)/objs/%.o:$(SRCDIR)/%.S
-	$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@
-
-$(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS))
-$(1)/$(APP): $$($(1)_OBJS)
-	$(CC) $$(CFLAGS) -o $$@ $(TOPDIR)/../libcmini/m5475/startup.o $$($(1)_OBJS) -L$(TOPDIR)/../libcmini/m5475 $(LIBS)
-	$(STRIP) $$@
-endef
-$(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))
-
-$(DEPEND): $(ASRCS) $(CSRCS)
-	-rm -f $(DEPEND)
-	for d in $(TRGTDIRS);\
-		do $(CC) $(CFLAGS) $(INCLUDE) -M $(ASRCS) $(CSRCS) | sed -e "s#^\(.*\).o:#$$d/objs/\1.o:#" >> $(DEPEND); \
-    done
-
-
-clean:
-	@rm -f $(patsubst %,%/objs/*.o,$(TRGTDIRS)) $(patsubst %,%/$(APP),$(TRGTDIRS))
-	@rm -f $(DEPEND) mapfile
-
-.PHONY: printvars
-printvars:
-	@$(foreach V,$(.VARIABLES), $(if $(filter-out environment% default automatic, $(origin $V)),$(warning $V=$($V))))
-
-ifneq (clean,$(MAKECMDGOALS))
-include $(DEPEND)
-endif
--- a/tos/bascook/sources/bascook.c
+++ b/tos/bascook/sources/bascook.c
@@ -1,122 +0,0 @@
-#include <stdio.h>
-#include <mint/osbind.h>
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "driver_vec.h"
-
-struct driver_table *get_bas_drivers(void)
-{
-	struct driver_table *ret = NULL;
-
-	__asm__ __volatile(
-		"	trap	#0\n\t"
-		"	move.l	d0,%[ret]\n\t"
-		:	[ret] "=m" (ret)	/* output */
-		:						/* no inputs */
-		:						/* clobbered */
-	);
-
-	return ret;
-}
-
-static uint32_t cookieptr(void)
-{
-	return * (uint32_t *) 0x5a0L;
-}
-
-void setcookie(uint32_t cookie, uint32_t value)
-{
-	uint32_t *cookiejar = (uint32_t *) Supexec(cookieptr);
-	int num_slots;
-	int max_slots;
-
-	num_slots = max_slots = 0;
-	do
-	{
-		if (cookiejar[0] == cookie)
-		{
-			cookiejar[1] = value;
-			return;
-		}
-		cookiejar = &(cookiejar[2]);
-		num_slots++;
-	} while (cookiejar[-2]);
-
-	/*
-	 * Here we are at the end of the list and did not find our cookie.
-	 * Let's check if there is any space left and append our value to the
-	 * list if so. If not, we are lost (extending the cookie jar does only
-	 * work from TSRs)
-	 */
-	if (cookiejar[-1])
-		max_slots = cookiejar[-1];
-
-	if (max_slots > num_slots)
-	{
-		 /* relief, there is space left, extend the list */
-		cookiejar[0] = cookiejar[-2];
-		cookiejar[1] = cookiejar[-1];
-		/* add the new element */
-		cookiejar[-2] = cookie;
-		cookiejar[-1] = value;
-	}
-	else
-		printf("cannot set cookie, cookie jar is full!\r\n");
-}
-
-# define COOKIE_DMAC	0x444D4143L /* FireTOS DMA API */
-
-static char *dt_to_str(enum driver_type dt)
-{
-	switch (dt)
-	{
-		case BLOCKDEV_DRIVER: return "generic block device driver";
-		case CHARDEV_DRIVER:  return "generic character device driver";
-		case VIDEO_DRIVER:    return "video/framebuffer driver";
-		case XHDI_DRIVER:     return "XHDI compatible hard disk driver";
-		case MCD_DRIVER:	  return "multichannel DMA driver";
-		case PCI_DRIVER:	  return "PCI interface driver";
-		default:              return "unknown driver type";
-	}
-}
-
-int main(int argc, char *argv[])
-{
-	struct driver_table *dt;
-	void *ssp;
-
-	(void) Cconws("retrieve BaS driver interface\r\n");
-
-	ssp = (void *) Super(0L);
-	dt = get_bas_drivers();
-	if (dt)
-	{
-		struct generic_interface *ifc = &dt->interfaces[0];
-
-		printf("BaS driver table found at %p, BaS version is %d.%d\r\n", dt,
-				dt->bas_version, dt->bas_revision);
-
-		while (ifc->type != END_OF_DRIVERS)
-		{
-			printf("driver \"%s (%s)\" found,\r\n"
-				   "interface type is %d (%s),\r\n"
-				   "version %d.%d\r\n\r\n",
-					ifc->name, ifc->description, ifc->type, dt_to_str(ifc->type),
-					ifc->version, ifc->revision);
-			if (ifc->type == MCD_DRIVER)
-			{
-				setcookie(COOKIE_DMAC, (uint32_t) ifc->interface.dma);
-				printf("\r\nDMAC cookie set to %p\r\n", ifc->interface.dma);
-			}
-			ifc++;
-		}
-	}
-	Super(ssp);
-
-	while (Cconis()) Cconin();	/* eat keys */
-	// printf("press any key to continue\n\r");
-	// while (! Cconis());
-	return 0;
-}
-
--- a/tos/jtagwait/Makefile
+++ b/tos/jtagwait/Makefile
@@ -1,103 +0,0 @@
-CROSS=Y
-
-CROSSBINDIR_IS_Y=m68k-atari-mint-
-CROSSBINDIR_IS_N=
-
-CROSSBINDIR=$(CROSSBINDIR_IS_$(CROSS))
-
-UNAME := $(shell uname)
-ifeq ($(CROSS), Y)
-ifeq ($(UNAME),Linux)
-PREFIX=m68k-atari-mint
-HATARI=hatari
-else
-PREFIX=m68k-atari-mint
-HATARI=/usr/local/bin/hatari
-endif
-else
-PREFIX=/usr
-endif
-
-DEPEND=depend
-TOPDIR = ../..
-
-INCLUDE=-I$(TOPDIR)/../libcmini/include -nostdlib
-LIBS=-lcmini -nostdlib -lgcc
-CC=$(PREFIX)/bin/gcc
-
-CC=$(CROSSBINDIR)gcc
-STRIP=$(CROSSBINDIR)strip
-STACK=$(CROSSBINDIR)stack
-
-APP=jtagwait.prg
-TEST_APP=$(APP)
-
-CFLAGS=\
-	-O0\
-	-g\
-	-Wl,-Map,mapfile\
-	-Wl,--defsym -Wl,__MBAR=0xff000000\
-	-Wl,--defsym -Wl,__MMUBAR=0xff040000\
-	-Wl,--defsym -Wl,__FPGA_JTAG_LOADED=0xff101000\
-	-Wl,--defsym -Wl,__FPGA_JTAG_VALID=0xff101004\
-	-Wall
-
-SRCDIR=sources
-INCDIR=include
-INCLUDE+=-I$(INCDIR)
-
-CSRCS=\
-	$(SRCDIR)/jtagwait.c \
-	$(SRCDIR)/bas_printf.c
-
-ASRCS=$(SRCDIR)/printf_helper.S
-
-COBJS=$(patsubst $(SRCDIR)/%.o,%.o,$(patsubst %.c,%.o,$(CSRCS)))
-AOBJS=$(patsubst $(SRCDIR)/%.o,%.o,$(patsubst %.S,%.o,$(ASRCS)))
-OBJS=$(COBJS) $(AOBJS)
-
-TRGTDIRS=./m5475 ./m5475/mshort
-OBJDIRS=$(patsubst %,%/objs,$(TRGTDIRS))
-
-#
-# multilib flags. These must match m68k-atari-mint-gcc -print-multi-lib output
-#
-m5475/$(APP):CFLAGS += -mcpu=5475
-m5475/mshort/$(APP): CFLAGS += -mcpu=5475 -mshort
-
-all:$(patsubst %,%/$(APP),$(TRGTDIRS))
-#
-# generate pattern rules for multilib object files.
-#
-define CC_TEMPLATE
-$(1)/objs/%.o:$(SRCDIR)/%.c
-	$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@
-
-$(1)/objs/%.o:$(SRCDIR)/%.S
-	$(CC) $$(CFLAGS) $(INCLUDE) -c $$< -o $$@
-
-$(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS))
-$(1)/$(APP): $$($(1)_OBJS)
-	$(CC) $$(CFLAGS) -o $$@ $(TOPDIR)/../libcmini/$(1)/startup.o $$($(1)_OBJS) -L$(TOPDIR)/../libcmini/$(1) $(LIBS)
-	$(STRIP) $$@
-endef
-$(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))
-
-$(DEPEND): $(ASRCS) $(CSRCS)
-	-rm -f $(DEPEND)
-	for d in $(TRGTDIRS);\
-		do $(CC) $(CFLAGS) $(INCLUDE) -M $(ASRCS) $(CSRCS) | sed -e "s#^\(.*\).o:#$$d/objs/\1.o:#" >> $(DEPEND); \
-    done
-
-
-clean:
-	@rm -f $(patsubst %,%/objs/*.o,$(TRGTDIRS)) $(patsubst %,%/$(APP),$(TRGTDIRS))
-	@rm -f $(DEPEND) mapfile
-
-.PHONY: printvars
-printvars:
-	@$(foreach V,$(.VARIABLES), $(if $(filter-out environment% default automatic, $(origin $V)),$(warning $V=$($V))))
-
-ifneq (clean,$(MAKECMDGOALS))
-include $(DEPEND)
-endif
--- a/tos/jtagwait/include/MCF5475.h
+++ b/tos/jtagwait/include/MCF5475.h
@@ -1,67 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_H__
-#define __MCF5475_H__
-
-#include <stdint.h>
-/***
- * MCF5475 Derivative Memory map definitions from linker command files:
- * __MBAR, __MMUBAR, __RAMBAR0, __RAMBAR0_SIZE, __RAMBAR1, __RAMBAR1_SIZE
- * linker symbols must be defined in the linker command file.
- */
-
-typedef uint32_t __attribute__((__may_alias__)) uint32_t_a;	/* a type to avoid gcc's complaints about pointer aliasing */
-
-extern uint8_t _MBAR[];
-extern uint8_t _MMUBAR[];
-extern uint8_t _RAMBAR0[];
-extern uint8_t _RAMBAR0_SIZE[];
-extern uint8_t _RAMBAR1[];
-extern uint8_t _RAMBAR1_SIZE[];
-
-#define MBAR_ADDRESS    (uint32_t)_MBAR
-#define MMUBAR_ADDRESS  (uint32_t)_MMUBAR
-#define RAMBAR0_ADDRESS (uint32_t)_RAMBAR0
-#define RAMBAR0_SIZE    (uint32_t)_RAMBAR0_SIZE
-#define RAMBAR1_ADDRESS (uint32_t)_RAMBAR1
-#define RAMBAR1_SIZE    (uint32_t)_RAMBAR1_SIZE
-
-
-#include "MCF5475_SIU.h"
-#include "MCF5475_MMU.h"
-#include "MCF5475_SDRAMC.h"
-#include "MCF5475_XLB.h"
-#include "MCF5475_CLOCK.h"
-#include "MCF5475_FBCS.h"
-#include "MCF5475_INTC.h"
-#include "MCF5475_GPT.h"
-#include "MCF5475_SLT.h"
-#include "MCF5475_GPIO.h"
-#include "MCF5475_PAD.h"
-#include "MCF5475_PCI.h"
-#include "MCF5475_PCIARB.h"
-#include "MCF5475_EPORT.h"
-#include "MCF5475_CTM.h"
-#include "MCF5475_DMA.h"
-#include "MCF5475_PSC.h"
-#include "MCF5475_DSPI.h"
-#include "MCF5475_I2C.h"
-#include "MCF5475_FEC.h"
-#include "MCF5475_USB.h"
-#include "MCF5475_SRAM.h"
-#include "MCF5475_SEC.h"
-
-#endif /* __MCF5475_H__ */
--- a/tos/jtagwait/include/MCF5475_CLOCK.h
+++ b/tos/jtagwait/include/MCF5475_CLOCK.h
@@ -1,47 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_CLOCK_H__
-#define __MCF5475_CLOCK_H__
-
-
-/*********************************************************************
-*
-* Clock Module (CLOCK)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_CLOCK_SPCR                       (*(volatile uint32_t*)(&_MBAR[0x300]))
-
-
-/* Bit definitions and macros for MCF_CLOCK_SPCR */
-#define MCF_CLOCK_SPCR_MEMEN                 (0x1)
-#define MCF_CLOCK_SPCR_PCIEN                 (0x2)
-#define MCF_CLOCK_SPCR_FBEN                  (0x4)
-#define MCF_CLOCK_SPCR_CAN0EN                (0x8)
-#define MCF_CLOCK_SPCR_DMAEN                 (0x10)
-#define MCF_CLOCK_SPCR_FEC0EN                (0x20)
-#define MCF_CLOCK_SPCR_FEC1EN                (0x40)
-#define MCF_CLOCK_SPCR_USBEN                 (0x80)
-#define MCF_CLOCK_SPCR_PSCEN                 (0x200)
-#define MCF_CLOCK_SPCR_CAN1EN                (0x800)
-#define MCF_CLOCK_SPCR_CRYENA                (0x1000)
-#define MCF_CLOCK_SPCR_CRYENB                (0x2000)
-#define MCF_CLOCK_SPCR_COREN                 (0x4000)
-#define MCF_CLOCK_SPCR_PLLK                  (0x80000000)
-
-
-#endif /* __MCF5475_CLOCK_H__ */
--- a/tos/jtagwait/include/MCF5475_CTM.h
+++ b/tos/jtagwait/include/MCF5475_CTM.h
@@ -1,76 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_CTM_H__
-#define __MCF5475_CTM_H__
-
-
-/*********************************************************************
-*
-* Comm Timer Module (CTM)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_CTM_CTCR0                        (*(volatile uint32_t*)(&_MBAR[0x7F00]))
-#define MCF_CTM_CTCR1                        (*(volatile uint32_t*)(&_MBAR[0x7F04]))
-#define MCF_CTM_CTCR2                        (*(volatile uint32_t*)(&_MBAR[0x7F08]))
-#define MCF_CTM_CTCR3                        (*(volatile uint32_t*)(&_MBAR[0x7F0C]))
-#define MCF_CTM_CTCR4                        (*(volatile uint32_t*)(&_MBAR[0x7F10]))
-#define MCF_CTM_CTCR5                        (*(volatile uint32_t*)(&_MBAR[0x7F14]))
-#define MCF_CTM_CTCR6                        (*(volatile uint32_t*)(&_MBAR[0x7F18]))
-#define MCF_CTM_CTCR7                        (*(volatile uint32_t*)(&_MBAR[0x7F1C]))
-#define MCF_CTM_CTCRF(x)                     (*(volatile uint32_t*)(&_MBAR[0x7F00 + ((x)*0x4)]))
-#define MCF_CTM_CTCRV(x)                     (*(volatile uint32_t*)(&_MBAR[0x7F10 + ((x-4)*0x4)]))
-
-
-/* Bit definitions and macros for MCF_CTM_CTCRF */
-#define MCF_CTM_CTCRF_CRV(x)                 (((x)&0xFFFF)<<0)
-#define MCF_CTM_CTCRF_S(x)                   (((x)&0xF)<<0x10)
-#define MCF_CTM_CTCRF_S_CLK_1                (0)
-#define MCF_CTM_CTCRF_S_CLK_2                (0x10000)
-#define MCF_CTM_CTCRF_S_CLK_4                (0x20000)
-#define MCF_CTM_CTCRF_S_CLK_8                (0x30000)
-#define MCF_CTM_CTCRF_S_CLK_16               (0x40000)
-#define MCF_CTM_CTCRF_S_CLK_32               (0x50000)
-#define MCF_CTM_CTCRF_S_CLK_64               (0x60000)
-#define MCF_CTM_CTCRF_S_CLK_128              (0x70000)
-#define MCF_CTM_CTCRF_S_CLK_256              (0x80000)
-#define MCF_CTM_CTCRF_S_CLK_EXT              (0x90000)
-#define MCF_CTM_CTCRF_PCT(x)                 (((x)&0x7)<<0x14)
-#define MCF_CTM_CTCRF_PCT_100                (0)
-#define MCF_CTM_CTCRF_PCT_50                 (0x100000)
-#define MCF_CTM_CTCRF_PCT_25                 (0x200000)
-#define MCF_CTM_CTCRF_PCT_12p5               (0x300000)
-#define MCF_CTM_CTCRF_PCT_6p25               (0x400000)
-#define MCF_CTM_CTCRF_PCT_OFF                (0x500000)
-#define MCF_CTM_CTCRF_M                      (0x800000)
-#define MCF_CTM_CTCRF_IM                     (0x1000000)
-#define MCF_CTM_CTCRF_I                      (0x80000000)
-
-/* Bit definitions and macros for MCF_CTM_CTCRV */
-#define MCF_CTM_CTCRV_CRV(x)                 (((x)&0xFFFFFF)<<0)
-#define MCF_CTM_CTCRV_PCT(x)                 (((x)&0x7)<<0x18)
-#define MCF_CTM_CTCRV_PCT_100                (0)
-#define MCF_CTM_CTCRV_PCT_50                 (0x1000000)
-#define MCF_CTM_CTCRV_PCT_25                 (0x2000000)
-#define MCF_CTM_CTCRV_PCT_12p5               (0x3000000)
-#define MCF_CTM_CTCRV_PCT_6p25               (0x4000000)
-#define MCF_CTM_CTCRV_PCT_OFF                (0x5000000)
-#define MCF_CTM_CTCRV_M                      (0x8000000)
-#define MCF_CTM_CTCRV_S                      (0x10000000)
-
-
-#endif /* __MCF5475_CTM_H__ */
--- a/tos/jtagwait/include/MCF5475_DMA.h
+++ b/tos/jtagwait/include/MCF5475_DMA.h
@@ -1,234 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_DMA_H__
-#define __MCF5475_DMA_H__
-
-
-/*********************************************************************
-*
-* Multichannel DMA (DMA)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_DMA_TASKBAR                      (*(volatile uint32_t*)(&_MBAR[0x8000]))
-#define MCF_DMA_CP                           (*(volatile uint32_t*)(&_MBAR[0x8004]))
-#define MCF_DMA_EP                           (*(volatile uint32_t*)(&_MBAR[0x8008]))
-#define MCF_DMA_VP                           (*(volatile uint32_t*)(&_MBAR[0x800C]))
-#define MCF_DMA_PTD                          (*(volatile uint32_t*)(&_MBAR[0x8010]))
-#define MCF_DMA_DIPR                         (*(volatile uint32_t*)(&_MBAR[0x8014]))
-#define MCF_DMA_DIMR                         (*(volatile uint32_t*)(&_MBAR[0x8018]))
-#define MCF_DMA_TCR0                         (*(volatile uint16_t*)(&_MBAR[0x801C]))
-#define MCF_DMA_TCR1                         (*(volatile uint16_t*)(&_MBAR[0x801E]))
-#define MCF_DMA_TCR2                         (*(volatile uint16_t*)(&_MBAR[0x8020]))
-#define MCF_DMA_TCR3                         (*(volatile uint16_t*)(&_MBAR[0x8022]))
-#define MCF_DMA_TCR4                         (*(volatile uint16_t*)(&_MBAR[0x8024]))
-#define MCF_DMA_TCR5                         (*(volatile uint16_t*)(&_MBAR[0x8026]))
-#define MCF_DMA_TCR6                         (*(volatile uint16_t*)(&_MBAR[0x8028]))
-#define MCF_DMA_TCR7                         (*(volatile uint16_t*)(&_MBAR[0x802A]))
-#define MCF_DMA_TCR8                         (*(volatile uint16_t*)(&_MBAR[0x802C]))
-#define MCF_DMA_TCR9                         (*(volatile uint16_t*)(&_MBAR[0x802E]))
-#define MCF_DMA_TCR10                        (*(volatile uint16_t*)(&_MBAR[0x8030]))
-#define MCF_DMA_TCR11                        (*(volatile uint16_t*)(&_MBAR[0x8032]))
-#define MCF_DMA_TCR12                        (*(volatile uint16_t*)(&_MBAR[0x8034]))
-#define MCF_DMA_TCR13                        (*(volatile uint16_t*)(&_MBAR[0x8036]))
-#define MCF_DMA_TCR14                        (*(volatile uint16_t*)(&_MBAR[0x8038]))
-#define MCF_DMA_TCR15                        (*(volatile uint16_t*)(&_MBAR[0x803A]))
-#define MCF_DMA_PRIOR0                       (*(volatile uint8_t *)(&_MBAR[0x803C]))
-#define MCF_DMA_PRIOR1                       (*(volatile uint8_t *)(&_MBAR[0x803D]))
-#define MCF_DMA_PRIOR2                       (*(volatile uint8_t *)(&_MBAR[0x803E]))
-#define MCF_DMA_PRIOR3                       (*(volatile uint8_t *)(&_MBAR[0x803F]))
-#define MCF_DMA_PRIOR4                       (*(volatile uint8_t *)(&_MBAR[0x8040]))
-#define MCF_DMA_PRIOR5                       (*(volatile uint8_t *)(&_MBAR[0x8041]))
-#define MCF_DMA_PRIOR6                       (*(volatile uint8_t *)(&_MBAR[0x8042]))
-#define MCF_DMA_PRIOR7                       (*(volatile uint8_t *)(&_MBAR[0x8043]))
-#define MCF_DMA_PRIOR8                       (*(volatile uint8_t *)(&_MBAR[0x8044]))
-#define MCF_DMA_PRIOR9                       (*(volatile uint8_t *)(&_MBAR[0x8045]))
-#define MCF_DMA_PRIOR10                      (*(volatile uint8_t *)(&_MBAR[0x8046]))
-#define MCF_DMA_PRIOR11                      (*(volatile uint8_t *)(&_MBAR[0x8047]))
-#define MCF_DMA_PRIOR12                      (*(volatile uint8_t *)(&_MBAR[0x8048]))
-#define MCF_DMA_PRIOR13                      (*(volatile uint8_t *)(&_MBAR[0x8049]))
-#define MCF_DMA_PRIOR14                      (*(volatile uint8_t *)(&_MBAR[0x804A]))
-#define MCF_DMA_PRIOR15                      (*(volatile uint8_t *)(&_MBAR[0x804B]))
-#define MCF_DMA_PRIOR16                      (*(volatile uint8_t *)(&_MBAR[0x804C]))
-#define MCF_DMA_PRIOR17                      (*(volatile uint8_t *)(&_MBAR[0x804D]))
-#define MCF_DMA_PRIOR18                      (*(volatile uint8_t *)(&_MBAR[0x804E]))
-#define MCF_DMA_PRIOR19                      (*(volatile uint8_t *)(&_MBAR[0x804F]))
-#define MCF_DMA_PRIOR20                      (*(volatile uint8_t *)(&_MBAR[0x8050]))
-#define MCF_DMA_PRIOR21                      (*(volatile uint8_t *)(&_MBAR[0x8051]))
-#define MCF_DMA_PRIOR22                      (*(volatile uint8_t *)(&_MBAR[0x8052]))
-#define MCF_DMA_PRIOR23                      (*(volatile uint8_t *)(&_MBAR[0x8053]))
-#define MCF_DMA_PRIOR24                      (*(volatile uint8_t *)(&_MBAR[0x8054]))
-#define MCF_DMA_PRIOR25                      (*(volatile uint8_t *)(&_MBAR[0x8055]))
-#define MCF_DMA_PRIOR26                      (*(volatile uint8_t *)(&_MBAR[0x8056]))
-#define MCF_DMA_PRIOR27                      (*(volatile uint8_t *)(&_MBAR[0x8057]))
-#define MCF_DMA_PRIOR28                      (*(volatile uint8_t *)(&_MBAR[0x8058]))
-#define MCF_DMA_PRIOR29                      (*(volatile uint8_t *)(&_MBAR[0x8059]))
-#define MCF_DMA_PRIOR30                      (*(volatile uint8_t *)(&_MBAR[0x805A]))
-#define MCF_DMA_PRIOR31                      (*(volatile uint8_t *)(&_MBAR[0x805B]))
-#define MCF_DMA_IMCR                         (*(volatile uint32_t*)(&_MBAR[0x805C]))
-#define MCF_DMA_TSKSZ0                       (*(volatile uint32_t*)(&_MBAR[0x8060]))
-#define MCF_DMA_TSKSZ1                       (*(volatile uint32_t*)(&_MBAR[0x8064]))
-#define MCF_DMA_DBGCOMP0                     (*(volatile uint32_t*)(&_MBAR[0x8070]))
-#define MCF_DMA_DBGCOMP2                     (*(volatile uint32_t*)(&_MBAR[0x8074]))
-#define MCF_DMA_DBGCTL                       (*(volatile uint32_t*)(&_MBAR[0x8078]))
-#define MCF_DMA_TCR(x)                       (*(volatile uint16_t*)(&_MBAR[0x801C + ((x)*0x2)]))
-#define MCF_DMA_PRIOR(x)                     (*(volatile uint8_t *)(&_MBAR[0x803C + ((x)*0x1)]))
-
-
-/* Bit definitions and macros for MCF_DMA_TASKBAR */
-#define MCF_DMA_TASKBAR_TASK_BASE_ADDRESS(x) (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_DMA_CP */
-#define MCF_DMA_CP_DESCRIPTOR_POINTER(x)     (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_DMA_EP */
-#define MCF_DMA_EP_DESCRIPTOR_POINTER(x)     (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_DMA_VP */
-#define MCF_DMA_VP_VARIABLE_POINTER(x)       (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_DMA_PTD */
-#define MCF_DMA_PTD_PCTL0                    (0x1)
-#define MCF_DMA_PTD_PCTL1                    (0x2)
-#define MCF_DMA_PTD_PCTL13                   (0x2000)
-#define MCF_DMA_PTD_PCTL14                   (0x4000)
-#define MCF_DMA_PTD_PCTL15                   (0x8000)
-
-/* Bit definitions and macros for MCF_DMA_DIPR */
-#define MCF_DMA_DIPR_TASK(x)                 (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_DMA_DIMR */
-#define MCF_DMA_DIMR_TASK(x)                 (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_DMA_TCR */
-#define MCF_DMA_TCR_ASTSKNUM(x)              (((x)&0xF)<<0)
-#define MCF_DMA_TCR_HLDINITNUM               (0x20)
-#define MCF_DMA_TCR_HIPRITSKEN               (0x40)
-#define MCF_DMA_TCR_ASTRT                    (0x80)
-#define MCF_DMA_TCR_INITNUM(x)               (((x)&0x1F)<<0x8)
-#define MCF_DMA_TCR_ALWINIT                  (0x2000)
-#define MCF_DMA_TCR_V                        (0x4000)
-#define MCF_DMA_TCR_EN                       (0x8000)
-
-/* Bit definitions and macros for MCF_DMA_PRIOR */
-#define MCF_DMA_PRIOR_PRI(x)                 (((x)&0x7)<<0)
-#define MCF_DMA_PRIOR_HLD                    (0x80)
-
-/* Bit definitions and macros for MCF_DMA_IMCR */
-#define MCF_DMA_IMCR_IMC16(x)	(((x)&0x3)<<0)
-#define MCF_DMA_IMCR_IMC17(x)	(((x)&0x3)<<0x2)
-#define MCF_DMA_IMCR_IMC18(x)	(((x)&0x3)<<0x4)
-#define MCF_DMA_IMCR_IMC19(x)	(((x)&0x3)<<0x6)
-#define MCF_DMA_IMCR_IMC20(x)	(((x)&0x3)<<0x8)
-#define MCF_DMA_IMCR_IMC21(x)	(((x)&0x3)<<0xA)
-#define MCF_DMA_IMCR_IMC22(x)	(((x)&0x3)<<0xC)
-#define MCF_DMA_IMCR_IMC23(x)	(((x)&0x3)<<0xE)
-#define MCF_DMA_IMCR_IMC24(x)	(((x)&0x3)<<0x10)
-#define MCF_DMA_IMCR_IMC25(x)	(((x)&0x3)<<0x12)
-#define MCF_DMA_IMCR_IMC26(x)	(((x)&0x3)<<0x14)
-#define MCF_DMA_IMCR_IMC27(x)	(((x)&0x3)<<0x16)
-#define MCF_DMA_IMCR_IMC28(x)	(((x)&0x3)<<0x18)
-#define MCF_DMA_IMCR_IMC29(x)	(((x)&0x3)<<0x1A)
-#define MCF_DMA_IMCR_IMC30(x)	(((x)&0x3)<<0x1C)
-#define MCF_DMA_IMCR_IMC31(x)	(((x)&0x3)<<0x1E)
-
-
-#define MCF_DMA_IMCR_IMC16_FEC0RX    (0x00000000)
-#define MCF_DMA_IMCR_IMC17_FEC0TX    (0x00000000)
-#define MCF_DMA_IMCR_IMC18_FEC0RX    (0x00000020)
-#define MCF_DMA_IMCR_IMC19_FEC0TX    (0x00000080)
-#define MCF_DMA_IMCR_IMC20_FEC1RX    (0x00000100)
-#define MCF_DMA_IMCR_IMC21_DREQ1     (0x00000000)
-#define MCF_DMA_IMCR_IMC21_FEC1TX    (0x00000400)
-#define MCF_DMA_IMCR_IMC22_FEC0RX    (0x00001000)
-#define MCF_DMA_IMCR_IMC23_FEC0TX    (0x00004000)
-#define MCF_DMA_IMCR_IMC24_CTM0      (0x00010000)
-#define MCF_DMA_IMCR_IMC24_FEC1RX    (0x00020000)
-#define MCF_DMA_IMCR_IMC25_CTM1      (0x00040000)
-#define MCF_DMA_IMCR_IMC25_FEC1TX    (0x00080000)
-#define MCF_DMA_IMCR_IMC26_USBEP4    (0x00000000)
-#define MCF_DMA_IMCR_IMC26_CTM2      (0x00200000)
-#define MCF_DMA_IMCR_IMC27_USBEP5    (0x00000000)
-#define MCF_DMA_IMCR_IMC27_CTM3      (0x00800000)
-#define MCF_DMA_IMCR_IMC28_USBEP6    (0x00000000)
-#define MCF_DMA_IMCR_IMC28_CTM4      (0x01000000)
-#define MCF_DMA_IMCR_IMC28_DREQ1     (0x02000000)
-#define MCF_DMA_IMCR_IMC28_PSC2RX    (0x03000000)
-#define MCF_DMA_IMCR_IMC29_DREQ1     (0x04000000)
-#define MCF_DMA_IMCR_IMC29_CTM5      (0x08000000)
-#define MCF_DMA_IMCR_IMC29_PSC2TX    (0x0C000000)
-#define MCF_DMA_IMCR_IMC30_FEC1RX    (0x00000000)
-#define MCF_DMA_IMCR_IMC30_CTM6      (0x10000000)
-#define MCF_DMA_IMCR_IMC30_PSC3RX    (0x30000000)
-#define MCF_DMA_IMCR_IMC31_FEC1TX    (0x00000000)
-#define MCF_DMA_IMCR_IMC31_CTM7      (0x80000000)
-#define MCF_DMA_IMCR_IMC31_PSC3TX    (0xC0000000)
-
-/* Bit definitions and macros for MCF_DMA_TSKSZ0 */
-#define MCF_DMA_TSKSZ0_DSTSZ7(x)             (((x)&0x3)<<0)
-#define MCF_DMA_TSKSZ0_SRCSZ7(x)             (((x)&0x3)<<0x2)
-#define MCF_DMA_TSKSZ0_DSTSZ6(x)             (((x)&0x3)<<0x4)
-#define MCF_DMA_TSKSZ0_SRCSZ6(x)             (((x)&0x3)<<0x6)
-#define MCF_DMA_TSKSZ0_DSTSZ5(x)             (((x)&0x3)<<0x8)
-#define MCF_DMA_TSKSZ0_SRCSZ5(x)             (((x)&0x3)<<0xA)
-#define MCF_DMA_TSKSZ0_DSTSZ4(x)             (((x)&0x3)<<0xC)
-#define MCF_DMA_TSKSZ0_SRCSZ4(x)             (((x)&0x3)<<0xE)
-#define MCF_DMA_TSKSZ0_DSTSZ3(x)             (((x)&0x3)<<0x10)
-#define MCF_DMA_TSKSZ0_SRCSZ3(x)             (((x)&0x3)<<0x12)
-#define MCF_DMA_TSKSZ0_DSTSZ2(x)             (((x)&0x3)<<0x14)
-#define MCF_DMA_TSKSZ0_SRCSZ2(x)             (((x)&0x3)<<0x16)
-#define MCF_DMA_TSKSZ0_DSTSZ1(x)             (((x)&0x3)<<0x18)
-#define MCF_DMA_TSKSZ0_SRCSZ1(x)             (((x)&0x3)<<0x1A)
-#define MCF_DMA_TSKSZ0_DSTSZ0(x)             (((x)&0x3)<<0x1C)
-#define MCF_DMA_TSKSZ0_SRCSZ0(x)             (((x)&0x3)<<0x1E)
-
-/* Bit definitions and macros for MCF_DMA_TSKSZ1 */
-#define MCF_DMA_TSKSZ1_DSTSZ15(x)            (((x)&0x3)<<0)
-#define MCF_DMA_TSKSZ1_SRCSZ15(x)            (((x)&0x3)<<0x2)
-#define MCF_DMA_TSKSZ1_DSTSZ14(x)            (((x)&0x3)<<0x4)
-#define MCF_DMA_TSKSZ1_SRCSZ14(x)            (((x)&0x3)<<0x6)
-#define MCF_DMA_TSKSZ1_DSTSZ13(x)            (((x)&0x3)<<0x8)
-#define MCF_DMA_TSKSZ1_SRCSZ13(x)            (((x)&0x3)<<0xA)
-#define MCF_DMA_TSKSZ1_DSTSZ12(x)            (((x)&0x3)<<0xC)
-#define MCF_DMA_TSKSZ1_SRCSZ12(x)            (((x)&0x3)<<0xE)
-#define MCF_DMA_TSKSZ1_DSTSZ11(x)            (((x)&0x3)<<0x10)
-#define MCF_DMA_TSKSZ1_SRCSZ11(x)            (((x)&0x3)<<0x12)
-#define MCF_DMA_TSKSZ1_DSTSZ10(x)            (((x)&0x3)<<0x14)
-#define MCF_DMA_TSKSZ1_SRCSZ10(x)            (((x)&0x3)<<0x16)
-#define MCF_DMA_TSKSZ1_DSTSZ9(x)             (((x)&0x3)<<0x18)
-#define MCF_DMA_TSKSZ1_SRCSZ9(x)             (((x)&0x3)<<0x1A)
-#define MCF_DMA_TSKSZ1_DSTSZ8(x)             (((x)&0x3)<<0x1C)
-#define MCF_DMA_TSKSZ1_SRCSZ8(x)             (((x)&0x3)<<0x1E)
-
-/* Bit definitions and macros for MCF_DMA_DBGCOMP0 */
-#define MCF_DMA_DBGCOMP0_COMPARATOR_VALUE(x) (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_DMA_DBGCOMP2 */
-#define MCF_DMA_DBGCOMP2_COMPARATOR_VALUE(x) (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_DMA_DBGCTL */
-#define MCF_DMA_DBGCTL_I                     (0x2)
-#define MCF_DMA_DBGCTL_E                     (0x4)
-#define MCF_DMA_DBGCTL_AND_OR                (0x80)
-#define MCF_DMA_DBGCTL_COMPARATOR_TYPE_2(x)  (((x)&0x7)<<0x8)
-#define MCF_DMA_DBGCTL_COMPARATOR_TYPE_1(x)  (((x)&0x7)<<0xB)
-#define MCF_DMA_DBGCTL_B                     (0x4000)
-#define MCF_DMA_DBGCTL_AA                    (0x8000)
-#define MCF_DMA_DBGCTL_BLOCK_TASKS(x)        (((x)&0xFFFF)<<0x10)
-
-
-#endif /* __MCF5475_DMA_H__ */
--- a/tos/jtagwait/include/MCF5475_DSPI.h
+++ b/tos/jtagwait/include/MCF5475_DSPI.h
@@ -1,150 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_DSPI_H__
-#define __MCF5475_DSPI_H__
-
-
-/*********************************************************************
-*
-* DMA Serial Peripheral Interface (DSPI)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_DSPI_DMCR                        (*(volatile uint32_t*)(&_MBAR[0x8A00]))
-#define MCF_DSPI_DTCR                        (*(volatile uint32_t*)(&_MBAR[0x8A08]))
-#define MCF_DSPI_DCTAR0                      (*(volatile uint32_t*)(&_MBAR[0x8A0C]))
-#define MCF_DSPI_DCTAR1                      (*(volatile uint32_t*)(&_MBAR[0x8A10]))
-#define MCF_DSPI_DCTAR2                      (*(volatile uint32_t*)(&_MBAR[0x8A14]))
-#define MCF_DSPI_DCTAR3                      (*(volatile uint32_t*)(&_MBAR[0x8A18]))
-#define MCF_DSPI_DCTAR4                      (*(volatile uint32_t*)(&_MBAR[0x8A1C]))
-#define MCF_DSPI_DCTAR5                      (*(volatile uint32_t*)(&_MBAR[0x8A20]))
-#define MCF_DSPI_DCTAR6                      (*(volatile uint32_t*)(&_MBAR[0x8A24]))
-#define MCF_DSPI_DCTAR7                      (*(volatile uint32_t*)(&_MBAR[0x8A28]))
-#define MCF_DSPI_DSR                         (*(volatile uint32_t*)(&_MBAR[0x8A2C]))
-#define MCF_DSPI_DIRSR                       (*(volatile uint32_t*)(&_MBAR[0x8A30]))
-#define MCF_DSPI_DTFR                        (*(volatile uint32_t*)(&_MBAR[0x8A34]))
-#define MCF_DSPI_DRFR                        (*(volatile uint32_t*)(&_MBAR[0x8A38]))
-#define MCF_DSPI_DTFDR0                      (*(volatile uint32_t*)(&_MBAR[0x8A3C]))
-#define MCF_DSPI_DTFDR1                      (*(volatile uint32_t*)(&_MBAR[0x8A40]))
-#define MCF_DSPI_DTFDR2                      (*(volatile uint32_t*)(&_MBAR[0x8A44]))
-#define MCF_DSPI_DTFDR3                      (*(volatile uint32_t*)(&_MBAR[0x8A48]))
-#define MCF_DSPI_DRFDR0                      (*(volatile uint32_t*)(&_MBAR[0x8A7C]))
-#define MCF_DSPI_DRFDR1                      (*(volatile uint32_t*)(&_MBAR[0x8A80]))
-#define MCF_DSPI_DRFDR2                      (*(volatile uint32_t*)(&_MBAR[0x8A84]))
-#define MCF_DSPI_DRFDR3                      (*(volatile uint32_t*)(&_MBAR[0x8A88]))
-#define MCF_DSPI_DCTAR(x)                    (*(volatile uint32_t*)(&_MBAR[0x8A0C + ((x)*0x4)]))
-#define MCF_DSPI_DTFDR(x)                    (*(volatile uint32_t*)(&_MBAR[0x8A3C + ((x)*0x4)]))
-#define MCF_DSPI_DRFDR(x)                    (*(volatile uint32_t*)(&_MBAR[0x8A7C + ((x)*0x4)]))
-
-
-/* Bit definitions and macros for MCF_DSPI_DMCR */
-#define MCF_DSPI_DMCR_HALT                   (0x1)
-#define MCF_DSPI_DMCR_SMPL_PT(x)             (((x)&0x3)<<0x8)
-#define MCF_DSPI_DMCR_SMPL_PT_0CLK           (0)
-#define MCF_DSPI_DMCR_SMPL_PT_1CLK           (0x100)
-#define MCF_DSPI_DMCR_SMPL_PT_2CLK           (0x200)
-#define MCF_DSPI_DMCR_CRXF                   (0x400)
-#define MCF_DSPI_DMCR_CTXF                   (0x800)
-#define MCF_DSPI_DMCR_DRXF                   (0x1000)
-#define MCF_DSPI_DMCR_DTXF                   (0x2000)
-#define MCF_DSPI_DMCR_CSIS0                  (0x10000)
-#define MCF_DSPI_DMCR_CSIS2                  (0x40000)
-#define MCF_DSPI_DMCR_CSIS3                  (0x80000)
-#define MCF_DSPI_DMCR_CSIS5                  (0x200000)
-#define MCF_DSPI_DMCR_ROOE                   (0x1000000)
-#define MCF_DSPI_DMCR_PCSSE                  (0x2000000)
-#define MCF_DSPI_DMCR_MTFE                   (0x4000000)
-#define MCF_DSPI_DMCR_FRZ                    (0x8000000)
-#define MCF_DSPI_DMCR_DCONF(x)               (((x)&0x3)<<0x1C)
-#define MCF_DSPI_DMCR_CSCK                   (0x40000000)
-#define MCF_DSPI_DMCR_MSTR                   (0x80000000)
-
-/* Bit definitions and macros for MCF_DSPI_DTCR */
-#define MCF_DSPI_DTCR_SPI_TCNT(x)            (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_DSPI_DCTAR */
-#define MCF_DSPI_DCTAR_BR(x)                 (((x)&0xF)<<0)
-#define MCF_DSPI_DCTAR_DT(x)                 (((x)&0xF)<<0x4)
-#define MCF_DSPI_DCTAR_ASC(x)                (((x)&0xF)<<0x8)
-#define MCF_DSPI_DCTAR_CSSCK(x)              (((x)&0xF)<<0xC)
-#define MCF_DSPI_DCTAR_PBR(x)                (((x)&0x3)<<0x10)
-#define MCF_DSPI_DCTAR_PBR_1CLK              (0)
-#define MCF_DSPI_DCTAR_PBR_3CLK              (0x10000)
-#define MCF_DSPI_DCTAR_PBR_5CLK              (0x20000)
-#define MCF_DSPI_DCTAR_PBR_7CLK              (0x30000)
-#define MCF_DSPI_DCTAR_PDT(x)                (((x)&0x3)<<0x12)
-#define MCF_DSPI_DCTAR_PDT_1CLK              (0)
-#define MCF_DSPI_DCTAR_PDT_3CLK              (0x40000)
-#define MCF_DSPI_DCTAR_PDT_5CLK              (0x80000)
-#define MCF_DSPI_DCTAR_PDT_7CLK              (0xC0000)
-#define MCF_DSPI_DCTAR_PASC(x)               (((x)&0x3)<<0x14)
-#define MCF_DSPI_DCTAR_PASC_1CLK             (0)
-#define MCF_DSPI_DCTAR_PASC_3CLK             (0x100000)
-#define MCF_DSPI_DCTAR_PASC_5CLK             (0x200000)
-#define MCF_DSPI_DCTAR_PASC_7CLK             (0x300000)
-#define MCF_DSPI_DCTAR_PCSSCK(x)             (((x)&0x3)<<0x16)
-#define MCF_DSPI_DCTAR_LSBFE                 (0x1000000)
-#define MCF_DSPI_DCTAR_CPHA                  (0x2000000)
-#define MCF_DSPI_DCTAR_CPOL                  (0x4000000)
-#define MCF_DSPI_DCTAR_TRSZ(x)               (((x)&0xF)<<0x1B)
-
-/* Bit definitions and macros for MCF_DSPI_DSR */
-#define MCF_DSPI_DSR_RXPTR(x)                (((x)&0xF)<<0)
-#define MCF_DSPI_DSR_RXCTR(x)                (((x)&0xF)<<0x4)
-#define MCF_DSPI_DSR_TXPTR(x)                (((x)&0xF)<<0x8)
-#define MCF_DSPI_DSR_TXCTR(x)                (((x)&0xF)<<0xC)
-#define MCF_DSPI_DSR_RFDF                    (0x20000)
-#define MCF_DSPI_DSR_RFOF                    (0x80000)
-#define MCF_DSPI_DSR_TFFF                    (0x2000000)
-#define MCF_DSPI_DSR_TFUF                    (0x8000000)
-#define MCF_DSPI_DSR_EOQF                    (0x10000000)
-#define MCF_DSPI_DSR_TXRXS                   (0x40000000)
-#define MCF_DSPI_DSR_TCF                     (0x80000000)
-
-/* Bit definitions and macros for MCF_DSPI_DIRSR */
-#define MCF_DSPI_DIRSR_RFDFS                 (0x10000)
-#define MCF_DSPI_DIRSR_RFDFE                 (0x20000)
-#define MCF_DSPI_DIRSR_RFOFE                 (0x80000)
-#define MCF_DSPI_DIRSR_TFFFS                 (0x1000000)
-#define MCF_DSPI_DIRSR_TFFFE                 (0x2000000)
-#define MCF_DSPI_DIRSR_TFUFE                 (0x8000000)
-#define MCF_DSPI_DIRSR_EOQFE                 (0x10000000)
-#define MCF_DSPI_DIRSR_TCFE                  (0x80000000)
-
-/* Bit definitions and macros for MCF_DSPI_DTFR */
-#define MCF_DSPI_DTFR_TXDATA(x)              (((x)&0xFFFF)<<0)
-#define MCF_DSPI_DTFR_CS0                    (0x10000)
-#define MCF_DSPI_DTFR_CS2                    (0x40000)
-#define MCF_DSPI_DTFR_CS3                    (0x80000)
-#define MCF_DSPI_DTFR_CS5                    (0x200000)
-#define MCF_DSPI_DTFR_CTCNT                  (0x4000000)
-#define MCF_DSPI_DTFR_EOQ                    (0x8000000)
-#define MCF_DSPI_DTFR_CTAS(x)                (((x)&0x7)<<0x1C)
-#define MCF_DSPI_DTFR_CONT                   (0x80000000)
-
-/* Bit definitions and macros for MCF_DSPI_DRFR */
-#define MCF_DSPI_DRFR_RXDATA(x)              (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_DSPI_DTFDR */
-#define MCF_DSPI_DTFDR_TXDATA(x)             (((x)&0xFFFF)<<0)
-#define MCF_DSPI_DTFDR_TXCMD(x)              (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_DSPI_DRFDR */
-#define MCF_DSPI_DRFDR_RXDATA(x)             (((x)&0xFFFF)<<0)
-
-
-#endif /* __MCF5475_DSPI_H__ */
--- a/tos/jtagwait/include/MCF5475_EPORT.h
+++ b/tos/jtagwait/include/MCF5475_EPORT.h
@@ -1,123 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_EPORT_H__
-#define __MCF5475_EPORT_H__
-
-
-/*********************************************************************
-*
-* Edge Port Module (EPORT)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_EPORT_EPPAR                      (*(volatile uint16_t*)(&_MBAR[0xF00]))
-#define MCF_EPORT_EPDDR                      (*(volatile uint8_t *)(&_MBAR[0xF04]))
-#define MCF_EPORT_EPIER                      (*(volatile uint8_t *)(&_MBAR[0xF05]))
-#define MCF_EPORT_EPDR                       (*(volatile uint8_t *)(&_MBAR[0xF08]))
-#define MCF_EPORT_EPPDR                      (*(volatile uint8_t *)(&_MBAR[0xF09]))
-#define MCF_EPORT_EPFR                       (*(volatile uint8_t *)(&_MBAR[0xF0C]))
-
-
-
-/* Bit definitions and macros for MCF_EPORT_EPPAR */
-#define MCF_EPORT_EPPAR_EPPA1(x)             (((x)&0x3)<<0x2)
-#define MCF_EPORT_EPPAR_EPPA1_LEVEL          (0)
-#define MCF_EPORT_EPPAR_EPPA1_RISING         (0x4)
-#define MCF_EPORT_EPPAR_EPPA1_FALLING        (0x8)
-#define MCF_EPORT_EPPAR_EPPA1_BOTH           (0xC)
-#define MCF_EPORT_EPPAR_EPPA2(x)             (((x)&0x3)<<0x4)
-#define MCF_EPORT_EPPAR_EPPA2_LEVEL          (0)
-#define MCF_EPORT_EPPAR_EPPA2_RISING         (0x10)
-#define MCF_EPORT_EPPAR_EPPA2_FALLING        (0x20)
-#define MCF_EPORT_EPPAR_EPPA2_BOTH           (0x30)
-#define MCF_EPORT_EPPAR_EPPA3(x)             (((x)&0x3)<<0x6)
-#define MCF_EPORT_EPPAR_EPPA3_LEVEL          (0)
-#define MCF_EPORT_EPPAR_EPPA3_RISING         (0x40)
-#define MCF_EPORT_EPPAR_EPPA3_FALLING        (0x80)
-#define MCF_EPORT_EPPAR_EPPA3_BOTH           (0xC0)
-#define MCF_EPORT_EPPAR_EPPA4(x)             (((x)&0x3)<<0x8)
-#define MCF_EPORT_EPPAR_EPPA4_LEVEL          (0)
-#define MCF_EPORT_EPPAR_EPPA4_RISING         (0x100)
-#define MCF_EPORT_EPPAR_EPPA4_FALLING        (0x200)
-#define MCF_EPORT_EPPAR_EPPA4_BOTH           (0x300)
-#define MCF_EPORT_EPPAR_EPPA5(x)             (((x)&0x3)<<0xA)
-#define MCF_EPORT_EPPAR_EPPA5_LEVEL          (0)
-#define MCF_EPORT_EPPAR_EPPA5_RISING         (0x400)
-#define MCF_EPORT_EPPAR_EPPA5_FALLING        (0x800)
-#define MCF_EPORT_EPPAR_EPPA5_BOTH           (0xC00)
-#define MCF_EPORT_EPPAR_EPPA6(x)             (((x)&0x3)<<0xC)
-#define MCF_EPORT_EPPAR_EPPA6_LEVEL          (0)
-#define MCF_EPORT_EPPAR_EPPA6_RISING         (0x1000)
-#define MCF_EPORT_EPPAR_EPPA6_FALLING        (0x2000)
-#define MCF_EPORT_EPPAR_EPPA6_BOTH           (0x3000)
-#define MCF_EPORT_EPPAR_EPPA7(x)             (((x)&0x3)<<0xE)
-#define MCF_EPORT_EPPAR_EPPA7_LEVEL          (0)
-#define MCF_EPORT_EPPAR_EPPA7_RISING         (0x4000)
-#define MCF_EPORT_EPPAR_EPPA7_FALLING        (0x8000)
-#define MCF_EPORT_EPPAR_EPPA7_BOTH           (0xC000)
-#define MCF_EPORT_EPPAR_LEVEL                (0)
-#define MCF_EPORT_EPPAR_RISING               (0x1)
-#define MCF_EPORT_EPPAR_FALLING              (0x2)
-#define MCF_EPORT_EPPAR_BOTH                 (0x3)
-
-/* Bit definitions and macros for MCF_EPORT_EPDDR */
-#define MCF_EPORT_EPDDR_EPDD1                (0x2)
-#define MCF_EPORT_EPDDR_EPDD2                (0x4)
-#define MCF_EPORT_EPDDR_EPDD3                (0x8)
-#define MCF_EPORT_EPDDR_EPDD4                (0x10)
-#define MCF_EPORT_EPDDR_EPDD5                (0x20)
-#define MCF_EPORT_EPDDR_EPDD6                (0x40)
-#define MCF_EPORT_EPDDR_EPDD7                (0x80)
-
-/* Bit definitions and macros for MCF_EPORT_EPIER */
-#define MCF_EPORT_EPIER_EPIE1                (0x2)
-#define MCF_EPORT_EPIER_EPIE2                (0x4)
-#define MCF_EPORT_EPIER_EPIE3                (0x8)
-#define MCF_EPORT_EPIER_EPIE4                (0x10)
-#define MCF_EPORT_EPIER_EPIE5                (0x20)
-#define MCF_EPORT_EPIER_EPIE6                (0x40)
-#define MCF_EPORT_EPIER_EPIE7                (0x80)
-
-/* Bit definitions and macros for MCF_EPORT_EPDR */
-#define MCF_EPORT_EPDR_EPD1                  (0x2)
-#define MCF_EPORT_EPDR_EPD2                  (0x4)
-#define MCF_EPORT_EPDR_EPD3                  (0x8)
-#define MCF_EPORT_EPDR_EPD4                  (0x10)
-#define MCF_EPORT_EPDR_EPD5                  (0x20)
-#define MCF_EPORT_EPDR_EPD6                  (0x40)
-#define MCF_EPORT_EPDR_EPD7                  (0x80)
-
-/* Bit definitions and macros for MCF_EPORT_EPPDR */
-#define MCF_EPORT_EPPDR_EPPD1                (0x2)
-#define MCF_EPORT_EPPDR_EPPD2                (0x4)
-#define MCF_EPORT_EPPDR_EPPD3                (0x8)
-#define MCF_EPORT_EPPDR_EPPD4                (0x10)
-#define MCF_EPORT_EPPDR_EPPD5                (0x20)
-#define MCF_EPORT_EPPDR_EPPD6                (0x40)
-#define MCF_EPORT_EPPDR_EPPD7                (0x80)
-
-/* Bit definitions and macros for MCF_EPORT_EPFR */
-#define MCF_EPORT_EPFR_EPF1                  (0x2)
-#define MCF_EPORT_EPFR_EPF2                  (0x4)
-#define MCF_EPORT_EPFR_EPF3                  (0x8)
-#define MCF_EPORT_EPFR_EPF4                  (0x10)
-#define MCF_EPORT_EPFR_EPF5                  (0x20)
-#define MCF_EPORT_EPFR_EPF6                  (0x40)
-#define MCF_EPORT_EPFR_EPF7                  (0x80)
-
-
-#endif /* __MCF5475_EPORT_H__ */
--- a/tos/jtagwait/include/MCF5475_FBCS.h
+++ b/tos/jtagwait/include/MCF5475_FBCS.h
@@ -1,100 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_FBCS_H__
-#define __MCF5475_FBCS_H__
-
-
-/*********************************************************************
-*
-* FlexBus Chip Select Module (FBCS)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_FBCS0_CSAR                       (*(volatile uint32_t*)(&_MBAR[0x500]))
-#define MCF_FBCS0_CSMR                       (*(volatile uint32_t*)(&_MBAR[0x504]))
-#define MCF_FBCS0_CSCR                       (*(volatile uint32_t*)(&_MBAR[0x508]))
-
-#define MCF_FBCS1_CSAR                       (*(volatile uint32_t*)(&_MBAR[0x50C]))
-#define MCF_FBCS1_CSMR                       (*(volatile uint32_t*)(&_MBAR[0x510]))
-#define MCF_FBCS1_CSCR                       (*(volatile uint32_t*)(&_MBAR[0x514]))
-
-#define MCF_FBCS2_CSAR                       (*(volatile uint32_t*)(&_MBAR[0x518]))
-#define MCF_FBCS2_CSMR                       (*(volatile uint32_t*)(&_MBAR[0x51C]))
-#define MCF_FBCS2_CSCR                       (*(volatile uint32_t*)(&_MBAR[0x520]))
-
-#define MCF_FBCS3_CSAR                       (*(volatile uint32_t*)(&_MBAR[0x524]))
-#define MCF_FBCS3_CSMR                       (*(volatile uint32_t*)(&_MBAR[0x528]))
-#define MCF_FBCS3_CSCR                       (*(volatile uint32_t*)(&_MBAR[0x52C]))
-
-#define MCF_FBCS4_CSAR                       (*(volatile uint32_t*)(&_MBAR[0x530]))
-#define MCF_FBCS4_CSMR                       (*(volatile uint32_t*)(&_MBAR[0x534]))
-#define MCF_FBCS4_CSCR                       (*(volatile uint32_t*)(&_MBAR[0x538]))
-
-#define MCF_FBCS5_CSAR                       (*(volatile uint32_t*)(&_MBAR[0x53C]))
-#define MCF_FBCS5_CSMR                       (*(volatile uint32_t*)(&_MBAR[0x540]))
-#define MCF_FBCS5_CSCR                       (*(volatile uint32_t*)(&_MBAR[0x544]))
-
-#define MCF_FBCS_CSAR(x)                     (*(volatile uint32_t*)(&_MBAR[0x500 + ((x)*0xC)]))
-#define MCF_FBCS_CSMR(x)                     (*(volatile uint32_t*)(&_MBAR[0x504 + ((x)*0xC)]))
-#define MCF_FBCS_CSCR(x)                     (*(volatile uint32_t*)(&_MBAR[0x508 + ((x)*0xC)]))
-
-
-/* Bit definitions and macros for MCF_FBCS_CSAR */
-#define MCF_FBCS_CSAR_BA(x)                  ((x)&0xFFFF0000)
-
-/* Bit definitions and macros for MCF_FBCS_CSMR */
-#define MCF_FBCS_CSMR_V                      (0x1)
-#define MCF_FBCS_CSMR_WP                     (0x100)
-#define MCF_FBCS_CSMR_BAM(x)                 (((x)&0xFFFF)<<0x10)
-#define MCF_FBCS_CSMR_BAM_4G                 (0xFFFF0000)
-#define MCF_FBCS_CSMR_BAM_2G                 (0x7FFF0000)
-#define MCF_FBCS_CSMR_BAM_1G                 (0x3FFF0000)
-#define MCF_FBCS_CSMR_BAM_1024M              (0x3FFF0000)
-#define MCF_FBCS_CSMR_BAM_512M               (0x1FFF0000)
-#define MCF_FBCS_CSMR_BAM_256M               (0xFFF0000)
-#define MCF_FBCS_CSMR_BAM_128M               (0x7FF0000)
-#define MCF_FBCS_CSMR_BAM_64M                (0x3FF0000)
-#define MCF_FBCS_CSMR_BAM_32M                (0x1FF0000)
-#define MCF_FBCS_CSMR_BAM_16M                (0xFF0000)
-#define MCF_FBCS_CSMR_BAM_8M                 (0x7F0000)
-#define MCF_FBCS_CSMR_BAM_4M                 (0x3F0000)
-#define MCF_FBCS_CSMR_BAM_2M                 (0x1F0000)
-#define MCF_FBCS_CSMR_BAM_1M                 (0xF0000)
-#define MCF_FBCS_CSMR_BAM_1024K              (0xF0000)
-#define MCF_FBCS_CSMR_BAM_512K               (0x70000)
-#define MCF_FBCS_CSMR_BAM_256K               (0x30000)
-#define MCF_FBCS_CSMR_BAM_128K               (0x10000)
-#define MCF_FBCS_CSMR_BAM_64K                (0)
-
-/* Bit definitions and macros for MCF_FBCS_CSCR */
-#define MCF_FBCS_CSCR_BSTW                   (0x8)
-#define MCF_FBCS_CSCR_BSTR                   (0x10)
-#define MCF_FBCS_CSCR_BEM                    (0x20)
-#define MCF_FBCS_CSCR_PS(x)                  (((x)&0x3)<<0x6)
-#define MCF_FBCS_CSCR_PS_32                  (0)
-#define MCF_FBCS_CSCR_PS_8                   (0x40)
-#define MCF_FBCS_CSCR_PS_16                  (0x80)
-#define MCF_FBCS_CSCR_AA                     (0x100)
-#define MCF_FBCS_CSCR_WS(x)                  (((x)&0x3F)<<0xA)
-#define MCF_FBCS_CSCR_WRAH(x)                (((x)&0x3)<<0x10)
-#define MCF_FBCS_CSCR_RDAH(x)                (((x)&0x3)<<0x12)
-#define MCF_FBCS_CSCR_ASET(x)                (((x)&0x3)<<0x14)
-#define MCF_FBCS_CSCR_SWSEN                  (0x800000)
-#define MCF_FBCS_CSCR_SWS(x)                 (((x)&0x3F)<<0x1A)
-
-
-#endif /* __MCF5475_FBCS_H__ */
--- a/tos/jtagwait/include/MCF5475_FEC.h
+++ b/tos/jtagwait/include/MCF5475_FEC.h
@@ -1,680 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_FEC_H__
-#define __MCF5475_FEC_H__
-
-
-/*********************************************************************
-*
-* Fast Ethernet Controller(FEC)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_FEC0_EIR                         (*(volatile uint32_t*)(&_MBAR[0x9004]))
-#define MCF_FEC0_EIMR                        (*(volatile uint32_t*)(&_MBAR[0x9008]))
-#define MCF_FEC0_ECR                         (*(volatile uint32_t*)(&_MBAR[0x9024]))
-#define MCF_FEC0_MMFR                        (*(volatile uint32_t*)(&_MBAR[0x9040]))
-#define MCF_FEC0_MSCR                        (*(volatile uint32_t*)(&_MBAR[0x9044]))
-#define MCF_FEC0_MIBC                        (*(volatile uint32_t*)(&_MBAR[0x9064]))
-#define MCF_FEC0_RCR                         (*(volatile uint32_t*)(&_MBAR[0x9084]))
-#define MCF_FEC0_RHR                         (*(volatile uint32_t*)(&_MBAR[0x9088]))
-#define MCF_FEC0_TCR                         (*(volatile uint32_t*)(&_MBAR[0x90C4]))
-#define MCF_FEC0_PALR                        (*(volatile uint32_t*)(&_MBAR[0x90E4]))
-#define MCF_FEC0_PAHR                        (*(volatile uint32_t*)(&_MBAR[0x90E8]))
-#define MCF_FEC0_OPD                         (*(volatile uint32_t*)(&_MBAR[0x90EC]))
-#define MCF_FEC0_IAUR                        (*(volatile uint32_t*)(&_MBAR[0x9118]))
-#define MCF_FEC0_IALR                        (*(volatile uint32_t*)(&_MBAR[0x911C]))
-#define MCF_FEC0_GAUR                        (*(volatile uint32_t*)(&_MBAR[0x9120]))
-#define MCF_FEC0_GALR                        (*(volatile uint32_t*)(&_MBAR[0x9124]))
-#define MCF_FEC0_FECTFWR                     (*(volatile uint32_t*)(&_MBAR[0x9144]))
-#define MCF_FEC0_FECRFDR                     (*(volatile uint32_t*)(&_MBAR[0x9184]))
-#define MCF_FEC0_FECRFSR                     (*(volatile uint32_t*)(&_MBAR[0x9188]))
-#define MCF_FEC0_FECRFCR                     (*(volatile uint32_t*)(&_MBAR[0x918C]))
-#define MCF_FEC0_FECRLRFP                    (*(volatile uint32_t*)(&_MBAR[0x9190]))
-#define MCF_FEC0_FECRLWFP                    (*(volatile uint32_t*)(&_MBAR[0x9194]))
-#define MCF_FEC0_FECRFAR                     (*(volatile uint32_t*)(&_MBAR[0x9198]))
-#define MCF_FEC0_FECRFRP                     (*(volatile uint32_t*)(&_MBAR[0x919C]))
-#define MCF_FEC0_FECRFWP                     (*(volatile uint32_t*)(&_MBAR[0x91A0]))
-#define MCF_FEC0_FECTFDR                     (*(volatile uint32_t*)(&_MBAR[0x91A4]))
-#define MCF_FEC0_FECTFSR                     (*(volatile uint32_t*)(&_MBAR[0x91A8]))
-#define MCF_FEC0_FECTFCR                     (*(volatile uint32_t*)(&_MBAR[0x91AC]))
-#define MCF_FEC0_FECTLRFP                    (*(volatile uint32_t*)(&_MBAR[0x91B0]))
-#define MCF_FEC0_FECTLWFP                    (*(volatile uint32_t*)(&_MBAR[0x91B4]))
-#define MCF_FEC0_FECTFAR                     (*(volatile uint32_t*)(&_MBAR[0x91B8]))
-#define MCF_FEC0_FECTFRP                     (*(volatile uint32_t*)(&_MBAR[0x91BC]))
-#define MCF_FEC0_FECTFWP                     (*(volatile uint32_t*)(&_MBAR[0x91C0]))
-#define MCF_FEC0_FECFRST                     (*(volatile uint32_t*)(&_MBAR[0x91C4]))
-#define MCF_FEC0_FECCTCWR                    (*(volatile uint32_t*)(&_MBAR[0x91C8]))
-#define MCF_FEC0_RMON_T_DROP                 (*(volatile uint32_t*)(&_MBAR[0x9200]))
-#define MCF_FEC0_RMON_T_PACKETS              (*(volatile uint32_t*)(&_MBAR[0x9204]))
-#define MCF_FEC0_RMON_T_BC_PKT               (*(volatile uint32_t*)(&_MBAR[0x9208]))
-#define MCF_FEC0_RMON_T_MC_PKT               (*(volatile uint32_t*)(&_MBAR[0x920C]))
-#define MCF_FEC0_RMON_T_CRC_ALIGN            (*(volatile uint32_t*)(&_MBAR[0x9210]))
-#define MCF_FEC0_RMON_T_UNDERSIZE            (*(volatile uint32_t*)(&_MBAR[0x9214]))
-#define MCF_FEC0_RMON_T_OVERSIZE             (*(volatile uint32_t*)(&_MBAR[0x9218]))
-#define MCF_FEC0_RMON_T_FRAG                 (*(volatile uint32_t*)(&_MBAR[0x921C]))
-#define MCF_FEC0_RMON_T_JAB                  (*(volatile uint32_t*)(&_MBAR[0x9220]))
-#define MCF_FEC0_RMON_T_COL                  (*(volatile uint32_t*)(&_MBAR[0x9224]))
-#define MCF_FEC0_RMON_T_P64                  (*(volatile uint32_t*)(&_MBAR[0x9228]))
-#define MCF_FEC0_RMON_T_P65TO127             (*(volatile uint32_t*)(&_MBAR[0x922C]))
-#define MCF_FEC0_RMON_T_P128TO255            (*(volatile uint32_t*)(&_MBAR[0x9230]))
-#define MCF_FEC0_RMON_T_P256TO511            (*(volatile uint32_t*)(&_MBAR[0x9234]))
-#define MCF_FEC0_RMON_T_P512TO1023           (*(volatile uint32_t*)(&_MBAR[0x9238]))
-#define MCF_FEC0_RMON_T_P1024TO2047          (*(volatile uint32_t*)(&_MBAR[0x923C]))
-#define MCF_FEC0_RMON_T_P_GTE2048            (*(volatile uint32_t*)(&_MBAR[0x9240]))
-#define MCF_FEC0_RMON_T_OCTETS               (*(volatile uint32_t*)(&_MBAR[0x9244]))
-#define MCF_FEC0_IEEE_T_DROP                 (*(volatile uint32_t*)(&_MBAR[0x9248]))
-#define MCF_FEC0_IEEE_T_FRAME_OK             (*(volatile uint32_t*)(&_MBAR[0x924C]))
-#define MCF_FEC0_IEEE_T_1COL                 (*(volatile uint32_t*)(&_MBAR[0x9250]))
-#define MCF_FEC0_IEEE_T_MCOL                 (*(volatile uint32_t*)(&_MBAR[0x9254]))
-#define MCF_FEC0_IEEE_T_DEF                  (*(volatile uint32_t*)(&_MBAR[0x9258]))
-#define MCF_FEC0_IEEE_T_LCOL                 (*(volatile uint32_t*)(&_MBAR[0x925C]))
-#define MCF_FEC0_IEEE_T_EXCOL                (*(volatile uint32_t*)(&_MBAR[0x9260]))
-#define MCF_FEC0_IEEE_T_MACERR               (*(volatile uint32_t*)(&_MBAR[0x9264]))
-#define MCF_FEC0_IEEE_T_CSERR                (*(volatile uint32_t*)(&_MBAR[0x9268]))
-#define MCF_FEC0_IEEE_T_SQE                  (*(volatile uint32_t*)(&_MBAR[0x926C]))
-#define MCF_FEC0_IEEE_T_FDXFC                (*(volatile uint32_t*)(&_MBAR[0x9270]))
-#define MCF_FEC0_IEEE_T_OCTETS_OK            (*(volatile uint32_t*)(&_MBAR[0x9274]))
-#define MCF_FEC0_RMON_R_DROP                 (*(volatile uint32_t*)(&_MBAR[0x9280]))
-#define MCF_FEC0_RMON_R_PACKETS              (*(volatile uint32_t*)(&_MBAR[0x9284]))
-#define MCF_FEC0_RMON_R_BC_PKT               (*(volatile uint32_t*)(&_MBAR[0x9288]))
-#define MCF_FEC0_RMON_R_MC_PKT               (*(volatile uint32_t*)(&_MBAR[0x928C]))
-#define MCF_FEC0_RMON_R_CRC_ALIGN            (*(volatile uint32_t*)(&_MBAR[0x9290]))
-#define MCF_FEC0_RMON_R_UNDERSIZE            (*(volatile uint32_t*)(&_MBAR[0x9294]))
-#define MCF_FEC0_RMON_R_OVERSIZE             (*(volatile uint32_t*)(&_MBAR[0x9298]))
-#define MCF_FEC0_RMON_R_FRAG                 (*(volatile uint32_t*)(&_MBAR[0x929C]))
-#define MCF_FEC0_RMON_R_JAB                  (*(volatile uint32_t*)(&_MBAR[0x92A0]))
-#define MCF_FEC0_RMON_R_RESVD_0              (*(volatile uint32_t*)(&_MBAR[0x92A4]))
-#define MCF_FEC0_RMON_R_P64                  (*(volatile uint32_t*)(&_MBAR[0x92A8]))
-#define MCF_FEC0_RMON_R_P65TO127             (*(volatile uint32_t*)(&_MBAR[0x92AC]))
-#define MCF_FEC0_RMON_R_P128TO255            (*(volatile uint32_t*)(&_MBAR[0x92B0]))
-#define MCF_FEC0_RMON_R_P256TO511            (*(volatile uint32_t*)(&_MBAR[0x92B4]))
-#define MCF_FEC0_RMON_R_P512TO1023           (*(volatile uint32_t*)(&_MBAR[0x92B8]))
-#define MCF_FEC0_RMON_R_P1024TO2047          (*(volatile uint32_t*)(&_MBAR[0x92BC]))
-#define MCF_FEC0_RMON_R_P_GTE2048            (*(volatile uint32_t*)(&_MBAR[0x92C0]))
-#define MCF_FEC0_RMON_R_OCTETS               (*(volatile uint32_t*)(&_MBAR[0x92C4]))
-#define MCF_FEC0_IEEE_R_DROP                 (*(volatile uint32_t*)(&_MBAR[0x92C8]))
-#define MCF_FEC0_IEEE_R_FRAME_OK             (*(volatile uint32_t*)(&_MBAR[0x92CC]))
-#define MCF_FEC0_IEEE_R_CRC                  (*(volatile uint32_t*)(&_MBAR[0x92D0]))
-#define MCF_FEC0_IEEE_R_ALIGN                (*(volatile uint32_t*)(&_MBAR[0x92D4]))
-#define MCF_FEC0_IEEE_R_MACERR               (*(volatile uint32_t*)(&_MBAR[0x92D8]))
-#define MCF_FEC0_IEEE_R_FDXFC                (*(volatile uint32_t*)(&_MBAR[0x92DC]))
-#define MCF_FEC0_IEEE_R_OCTETS_OK            (*(volatile uint32_t*)(&_MBAR[0x92E0]))
-
-#define MCF_FEC1_EIR                         (*(volatile uint32_t*)(&_MBAR[0x9804]))
-#define MCF_FEC1_EIMR                        (*(volatile uint32_t*)(&_MBAR[0x9808]))
-#define MCF_FEC1_ECR                         (*(volatile uint32_t*)(&_MBAR[0x9824]))
-#define MCF_FEC1_MMFR                        (*(volatile uint32_t*)(&_MBAR[0x9840]))
-#define MCF_FEC1_MSCR                        (*(volatile uint32_t*)(&_MBAR[0x9844]))
-#define MCF_FEC1_MIBC                        (*(volatile uint32_t*)(&_MBAR[0x9864]))
-#define MCF_FEC1_RCR                         (*(volatile uint32_t*)(&_MBAR[0x9884]))
-#define MCF_FEC1_RHR                         (*(volatile uint32_t*)(&_MBAR[0x9888]))
-#define MCF_FEC1_TCR                         (*(volatile uint32_t*)(&_MBAR[0x98C4]))
-#define MCF_FEC1_PALR                        (*(volatile uint32_t*)(&_MBAR[0x98E4]))
-#define MCF_FEC1_PAHR                        (*(volatile uint32_t*)(&_MBAR[0x98E8]))
-#define MCF_FEC1_OPD                         (*(volatile uint32_t*)(&_MBAR[0x98EC]))
-#define MCF_FEC1_IAUR                        (*(volatile uint32_t*)(&_MBAR[0x9918]))
-#define MCF_FEC1_IALR                        (*(volatile uint32_t*)(&_MBAR[0x991C]))
-#define MCF_FEC1_GAUR                        (*(volatile uint32_t*)(&_MBAR[0x9920]))
-#define MCF_FEC1_GALR                        (*(volatile uint32_t*)(&_MBAR[0x9924]))
-#define MCF_FEC1_FECTFWR                     (*(volatile uint32_t*)(&_MBAR[0x9944]))
-#define MCF_FEC1_FECRFDR                     (*(volatile uint32_t*)(&_MBAR[0x9984]))
-#define MCF_FEC1_FECRFSR                     (*(volatile uint32_t*)(&_MBAR[0x9988]))
-#define MCF_FEC1_FECRFCR                     (*(volatile uint32_t*)(&_MBAR[0x998C]))
-#define MCF_FEC1_FECRLRFP                    (*(volatile uint32_t*)(&_MBAR[0x9990]))
-#define MCF_FEC1_FECRLWFP                    (*(volatile uint32_t*)(&_MBAR[0x9994]))
-#define MCF_FEC1_FECRFAR                     (*(volatile uint32_t*)(&_MBAR[0x9998]))
-#define MCF_FEC1_FECRFRP                     (*(volatile uint32_t*)(&_MBAR[0x999C]))
-#define MCF_FEC1_FECRFWP                     (*(volatile uint32_t*)(&_MBAR[0x99A0]))
-#define MCF_FEC1_FECTFDR                     (*(volatile uint32_t*)(&_MBAR[0x99A4]))
-#define MCF_FEC1_FECTFSR                     (*(volatile uint32_t*)(&_MBAR[0x99A8]))
-#define MCF_FEC1_FECTFCR                     (*(volatile uint32_t*)(&_MBAR[0x99AC]))
-#define MCF_FEC1_FECTLRFP                    (*(volatile uint32_t*)(&_MBAR[0x99B0]))
-#define MCF_FEC1_FECTLWFP                    (*(volatile uint32_t*)(&_MBAR[0x99B4]))
-#define MCF_FEC1_FECTFAR                     (*(volatile uint32_t*)(&_MBAR[0x99B8]))
-#define MCF_FEC1_FECTFRP                     (*(volatile uint32_t*)(&_MBAR[0x99BC]))
-#define MCF_FEC1_FECTFWP                     (*(volatile uint32_t*)(&_MBAR[0x99C0]))
-#define MCF_FEC1_FECFRST                     (*(volatile uint32_t*)(&_MBAR[0x99C4]))
-#define MCF_FEC1_FECCTCWR                    (*(volatile uint32_t*)(&_MBAR[0x99C8]))
-#define MCF_FEC1_RMON_T_DROP                 (*(volatile uint32_t*)(&_MBAR[0x9A00]))
-#define MCF_FEC1_RMON_T_PACKETS              (*(volatile uint32_t*)(&_MBAR[0x9A04]))
-#define MCF_FEC1_RMON_T_BC_PKT               (*(volatile uint32_t*)(&_MBAR[0x9A08]))
-#define MCF_FEC1_RMON_T_MC_PKT               (*(volatile uint32_t*)(&_MBAR[0x9A0C]))
-#define MCF_FEC1_RMON_T_CRC_ALIGN            (*(volatile uint32_t*)(&_MBAR[0x9A10]))
-#define MCF_FEC1_RMON_T_UNDERSIZE            (*(volatile uint32_t*)(&_MBAR[0x9A14]))
-#define MCF_FEC1_RMON_T_OVERSIZE             (*(volatile uint32_t*)(&_MBAR[0x9A18]))
-#define MCF_FEC1_RMON_T_FRAG                 (*(volatile uint32_t*)(&_MBAR[0x9A1C]))
-#define MCF_FEC1_RMON_T_JAB                  (*(volatile uint32_t*)(&_MBAR[0x9A20]))
-#define MCF_FEC1_RMON_T_COL                  (*(volatile uint32_t*)(&_MBAR[0x9A24]))
-#define MCF_FEC1_RMON_T_P64                  (*(volatile uint32_t*)(&_MBAR[0x9A28]))
-#define MCF_FEC1_RMON_T_P65TO127             (*(volatile uint32_t*)(&_MBAR[0x9A2C]))
-#define MCF_FEC1_RMON_T_P128TO255            (*(volatile uint32_t*)(&_MBAR[0x9A30]))
-#define MCF_FEC1_RMON_T_P256TO511            (*(volatile uint32_t*)(&_MBAR[0x9A34]))
-#define MCF_FEC1_RMON_T_P512TO1023           (*(volatile uint32_t*)(&_MBAR[0x9A38]))
-#define MCF_FEC1_RMON_T_P1024TO2047          (*(volatile uint32_t*)(&_MBAR[0x9A3C]))
-#define MCF_FEC1_RMON_T_P_GTE2048            (*(volatile uint32_t*)(&_MBAR[0x9A40]))
-#define MCF_FEC1_RMON_T_OCTETS               (*(volatile uint32_t*)(&_MBAR[0x9A44]))
-#define MCF_FEC1_IEEE_T_DROP                 (*(volatile uint32_t*)(&_MBAR[0x9A48]))
-#define MCF_FEC1_IEEE_T_FRAME_OK             (*(volatile uint32_t*)(&_MBAR[0x9A4C]))
-#define MCF_FEC1_IEEE_T_1COL                 (*(volatile uint32_t*)(&_MBAR[0x9A50]))
-#define MCF_FEC1_IEEE_T_MCOL                 (*(volatile uint32_t*)(&_MBAR[0x9A54]))
-#define MCF_FEC1_IEEE_T_DEF                  (*(volatile uint32_t*)(&_MBAR[0x9A58]))
-#define MCF_FEC1_IEEE_T_LCOL                 (*(volatile uint32_t*)(&_MBAR[0x9A5C]))
-#define MCF_FEC1_IEEE_T_EXCOL                (*(volatile uint32_t*)(&_MBAR[0x9A60]))
-#define MCF_FEC1_IEEE_T_MACERR               (*(volatile uint32_t*)(&_MBAR[0x9A64]))
-#define MCF_FEC1_IEEE_T_CSERR                (*(volatile uint32_t*)(&_MBAR[0x9A68]))
-#define MCF_FEC1_IEEE_T_SQE                  (*(volatile uint32_t*)(&_MBAR[0x9A6C]))
-#define MCF_FEC1_IEEE_T_FDXFC                (*(volatile uint32_t*)(&_MBAR[0x9A70]))
-#define MCF_FEC1_IEEE_T_OCTETS_OK            (*(volatile uint32_t*)(&_MBAR[0x9A74]))
-#define MCF_FEC1_RMON_R_DROP                 (*(volatile uint32_t*)(&_MBAR[0x9A80]))
-#define MCF_FEC1_RMON_R_PACKETS              (*(volatile uint32_t*)(&_MBAR[0x9A84]))
-#define MCF_FEC1_RMON_R_BC_PKT               (*(volatile uint32_t*)(&_MBAR[0x9A88]))
-#define MCF_FEC1_RMON_R_MC_PKT               (*(volatile uint32_t*)(&_MBAR[0x9A8C]))
-#define MCF_FEC1_RMON_R_CRC_ALIGN            (*(volatile uint32_t*)(&_MBAR[0x9A90]))
-#define MCF_FEC1_RMON_R_UNDERSIZE            (*(volatile uint32_t*)(&_MBAR[0x9A94]))
-#define MCF_FEC1_RMON_R_OVERSIZE             (*(volatile uint32_t*)(&_MBAR[0x9A98]))
-#define MCF_FEC1_RMON_R_FRAG                 (*(volatile uint32_t*)(&_MBAR[0x9A9C]))
-#define MCF_FEC1_RMON_R_JAB                  (*(volatile uint32_t*)(&_MBAR[0x9AA0]))
-#define MCF_FEC1_RMON_R_RESVD_0              (*(volatile uint32_t*)(&_MBAR[0x9AA4]))
-#define MCF_FEC1_RMON_R_P64                  (*(volatile uint32_t*)(&_MBAR[0x9AA8]))
-#define MCF_FEC1_RMON_R_P65TO127             (*(volatile uint32_t*)(&_MBAR[0x9AAC]))
-#define MCF_FEC1_RMON_R_P128TO255            (*(volatile uint32_t*)(&_MBAR[0x9AB0]))
-#define MCF_FEC1_RMON_R_P256TO511            (*(volatile uint32_t*)(&_MBAR[0x9AB4]))
-#define MCF_FEC1_RMON_R_P512TO1023           (*(volatile uint32_t*)(&_MBAR[0x9AB8]))
-#define MCF_FEC1_RMON_R_P1024TO2047          (*(volatile uint32_t*)(&_MBAR[0x9ABC]))
-#define MCF_FEC1_RMON_R_P_GTE2048            (*(volatile uint32_t*)(&_MBAR[0x9AC0]))
-#define MCF_FEC1_RMON_R_OCTETS               (*(volatile uint32_t*)(&_MBAR[0x9AC4]))
-#define MCF_FEC1_IEEE_R_DROP                 (*(volatile uint32_t*)(&_MBAR[0x9AC8]))
-#define MCF_FEC1_IEEE_R_FRAME_OK             (*(volatile uint32_t*)(&_MBAR[0x9ACC]))
-#define MCF_FEC1_IEEE_R_CRC                  (*(volatile uint32_t*)(&_MBAR[0x9AD0]))
-#define MCF_FEC1_IEEE_R_ALIGN                (*(volatile uint32_t*)(&_MBAR[0x9AD4]))
-#define MCF_FEC1_IEEE_R_MACERR               (*(volatile uint32_t*)(&_MBAR[0x9AD8]))
-#define MCF_FEC1_IEEE_R_FDXFC                (*(volatile uint32_t*)(&_MBAR[0x9ADC]))
-#define MCF_FEC1_IEEE_R_OCTETS_OK            (*(volatile uint32_t*)(&_MBAR[0x9AE0]))
-
-#define MCF_FEC_EIR(x)                       (*(volatile uint32_t*)(&_MBAR[0x9004 + ((x)*0x800)]))
-#define MCF_FEC_EIMR(x)                      (*(volatile uint32_t*)(&_MBAR[0x9008 + ((x)*0x800)]))
-#define MCF_FEC_ECR(x)                       (*(volatile uint32_t*)(&_MBAR[0x9024 + ((x)*0x800)]))
-#define MCF_FEC_MMFR(x)                      (*(volatile uint32_t*)(&_MBAR[0x9040 + ((x)*0x800)]))
-#define MCF_FEC_MSCR(x)                      (*(volatile uint32_t*)(&_MBAR[0x9044 + ((x)*0x800)]))
-#define MCF_FEC_MIBC(x)                      (*(volatile uint32_t*)(&_MBAR[0x9064 + ((x)*0x800)]))
-#define MCF_FEC_RCR(x)                       (*(volatile uint32_t*)(&_MBAR[0x9084 + ((x)*0x800)]))
-#define MCF_FEC_RHR(x)                       (*(volatile uint32_t*)(&_MBAR[0x9088 + ((x)*0x800)]))
-#define MCF_FEC_TCR(x)                       (*(volatile uint32_t*)(&_MBAR[0x90C4 + ((x)*0x800)]))
-#define MCF_FEC_PALR(x)                      (*(volatile uint32_t*)(&_MBAR[0x90E4 + ((x)*0x800)]))
-#define MCF_FEC_PAHR(x)                      (*(volatile uint32_t*)(&_MBAR[0x90E8 + ((x)*0x800)]))
-#define MCF_FEC_OPD(x)                       (*(volatile uint32_t*)(&_MBAR[0x90EC + ((x)*0x800)]))
-#define MCF_FEC_IAUR(x)                      (*(volatile uint32_t*)(&_MBAR[0x9118 + ((x)*0x800)]))
-#define MCF_FEC_IALR(x)                      (*(volatile uint32_t*)(&_MBAR[0x911C + ((x)*0x800)]))
-#define MCF_FEC_GAUR(x)                      (*(volatile uint32_t*)(&_MBAR[0x9120 + ((x)*0x800)]))
-#define MCF_FEC_GALR(x)                      (*(volatile uint32_t*)(&_MBAR[0x9124 + ((x)*0x800)]))
-#define MCF_FEC_FECTFWR(x)                   (*(volatile uint32_t*)(&_MBAR[0x9144 + ((x)*0x800)]))
-#define MCF_FEC_FECRFDR(x)                   (*(volatile uint32_t*)(&_MBAR[0x9184 + ((x)*0x800)]))
-#define MCF_FEC_FECRFSR(x)                   (*(volatile uint32_t*)(&_MBAR[0x9188 + ((x)*0x800)]))
-#define MCF_FEC_FECRFCR(x)                   (*(volatile uint32_t*)(&_MBAR[0x918C + ((x)*0x800)]))
-#define MCF_FEC_FECRLRFP(x)                  (*(volatile uint32_t*)(&_MBAR[0x9190 + ((x)*0x800)]))
-#define MCF_FEC_FECRLWFP(x)                  (*(volatile uint32_t*)(&_MBAR[0x9194 + ((x)*0x800)]))
-#define MCF_FEC_FECRFAR(x)                   (*(volatile uint32_t*)(&_MBAR[0x9198 + ((x)*0x800)]))
-#define MCF_FEC_FECRFRP(x)                   (*(volatile uint32_t*)(&_MBAR[0x919C + ((x)*0x800)]))
-#define MCF_FEC_FECRFWP(x)                   (*(volatile uint32_t*)(&_MBAR[0x91A0 + ((x)*0x800)]))
-#define MCF_FEC_FECTFDR(x)                   (*(volatile uint32_t*)(&_MBAR[0x91A4 + ((x)*0x800)]))
-#define MCF_FEC_FECTFSR(x)                   (*(volatile uint32_t*)(&_MBAR[0x91A8 + ((x)*0x800)]))
-#define MCF_FEC_FECTFCR(x)                   (*(volatile uint32_t*)(&_MBAR[0x91AC + ((x)*0x800)]))
-#define MCF_FEC_FECTLRFP(x)                  (*(volatile uint32_t*)(&_MBAR[0x91B0 + ((x)*0x800)]))
-#define MCF_FEC_FECTLWFP(x)                  (*(volatile uint32_t*)(&_MBAR[0x91B4 + ((x)*0x800)]))
-#define MCF_FEC_FECTFAR(x)                   (*(volatile uint32_t*)(&_MBAR[0x91B8 + ((x)*0x800)]))
-#define MCF_FEC_FECTFRP(x)                   (*(volatile uint32_t*)(&_MBAR[0x91BC + ((x)*0x800)]))
-#define MCF_FEC_FECTFWP(x)                   (*(volatile uint32_t*)(&_MBAR[0x91C0 + ((x)*0x800)]))
-#define MCF_FEC_FECFRST(x)                   (*(volatile uint32_t*)(&_MBAR[0x91C4 + ((x)*0x800)]))
-#define MCF_FEC_FECCTCWR(x)                  (*(volatile uint32_t*)(&_MBAR[0x91C8 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_DROP(x)               (*(volatile uint32_t*)(&_MBAR[0x9200 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_PACKETS(x)            (*(volatile uint32_t*)(&_MBAR[0x9204 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_BC_PKT(x)             (*(volatile uint32_t*)(&_MBAR[0x9208 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_MC_PKT(x)             (*(volatile uint32_t*)(&_MBAR[0x920C + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_CRC_ALIGN(x)          (*(volatile uint32_t*)(&_MBAR[0x9210 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_UNDERSIZE(x)          (*(volatile uint32_t*)(&_MBAR[0x9214 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_OVERSIZE(x)           (*(volatile uint32_t*)(&_MBAR[0x9218 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_FRAG(x)               (*(volatile uint32_t*)(&_MBAR[0x921C + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_JAB(x)                (*(volatile uint32_t*)(&_MBAR[0x9220 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_COL(x)                (*(volatile uint32_t*)(&_MBAR[0x9224 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_P64(x)                (*(volatile uint32_t*)(&_MBAR[0x9228 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_P65TO127(x)           (*(volatile uint32_t*)(&_MBAR[0x922C + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_P128TO255(x)          (*(volatile uint32_t*)(&_MBAR[0x9230 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_P256TO511(x)          (*(volatile uint32_t*)(&_MBAR[0x9234 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_P512TO1023(x)         (*(volatile uint32_t*)(&_MBAR[0x9238 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_P1024TO2047(x)        (*(volatile uint32_t*)(&_MBAR[0x923C + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_P_GTE2048(x)          (*(volatile uint32_t*)(&_MBAR[0x9240 + ((x)*0x800)]))
-#define MCF_FEC_RMON_T_OCTETS(x)             (*(volatile uint32_t*)(&_MBAR[0x9244 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_DROP(x)               (*(volatile uint32_t*)(&_MBAR[0x9248 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_FRAME_OK(x)           (*(volatile uint32_t*)(&_MBAR[0x924C + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_1COL(x)               (*(volatile uint32_t*)(&_MBAR[0x9250 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_MCOL(x)               (*(volatile uint32_t*)(&_MBAR[0x9254 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_DEF(x)                (*(volatile uint32_t*)(&_MBAR[0x9258 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_LCOL(x)               (*(volatile uint32_t*)(&_MBAR[0x925C + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_EXCOL(x)              (*(volatile uint32_t*)(&_MBAR[0x9260 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_MACERR(x)             (*(volatile uint32_t*)(&_MBAR[0x9264 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_CSERR(x)              (*(volatile uint32_t*)(&_MBAR[0x9268 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_SQE(x)                (*(volatile uint32_t*)(&_MBAR[0x926C + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_FDXFC(x)              (*(volatile uint32_t*)(&_MBAR[0x9270 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_T_OCTETS_OK(x)          (*(volatile uint32_t*)(&_MBAR[0x9274 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_DROP(x)               (*(volatile uint32_t*)(&_MBAR[0x9280 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_PACKETS(x)            (*(volatile uint32_t*)(&_MBAR[0x9284 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_BC_PKT(x)             (*(volatile uint32_t*)(&_MBAR[0x9288 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_MC_PKT(x)             (*(volatile uint32_t*)(&_MBAR[0x928C + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_CRC_ALIGN(x)          (*(volatile uint32_t*)(&_MBAR[0x9290 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_UNDERSIZE(x)          (*(volatile uint32_t*)(&_MBAR[0x9294 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_OVERSIZE(x)           (*(volatile uint32_t*)(&_MBAR[0x9298 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_FRAG(x)               (*(volatile uint32_t*)(&_MBAR[0x929C + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_JAB(x)                (*(volatile uint32_t*)(&_MBAR[0x92A0 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_RESVD_0(x)            (*(volatile uint32_t*)(&_MBAR[0x92A4 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_P64(x)                (*(volatile uint32_t*)(&_MBAR[0x92A8 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_P65TO127(x)           (*(volatile uint32_t*)(&_MBAR[0x92AC + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_P128TO255(x)          (*(volatile uint32_t*)(&_MBAR[0x92B0 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_P256TO511(x)          (*(volatile uint32_t*)(&_MBAR[0x92B4 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_P512TO1023(x)         (*(volatile uint32_t*)(&_MBAR[0x92B8 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_P1024TO2047(x)        (*(volatile uint32_t*)(&_MBAR[0x92BC + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_P_GTE2048(x)          (*(volatile uint32_t*)(&_MBAR[0x92C0 + ((x)*0x800)]))
-#define MCF_FEC_RMON_R_OCTETS(x)             (*(volatile uint32_t*)(&_MBAR[0x92C4 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_R_DROP(x)               (*(volatile uint32_t*)(&_MBAR[0x92C8 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_R_FRAME_OK(x)           (*(volatile uint32_t*)(&_MBAR[0x92CC + ((x)*0x800)]))
-#define MCF_FEC_IEEE_R_CRC(x)                (*(volatile uint32_t*)(&_MBAR[0x92D0 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_R_ALIGN(x)              (*(volatile uint32_t*)(&_MBAR[0x92D4 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_R_MACERR(x)             (*(volatile uint32_t*)(&_MBAR[0x92D8 + ((x)*0x800)]))
-#define MCF_FEC_IEEE_R_FDXFC(x)              (*(volatile uint32_t*)(&_MBAR[0x92DC + ((x)*0x800)]))
-#define MCF_FEC_IEEE_R_OCTETS_OK(x)          (*(volatile uint32_t*)(&_MBAR[0x92E0 + ((x)*0x800)]))
-
-
-/* Bit definitions and macros for MCF_FEC_EIR */
-#define MCF_FEC_EIR_RFERR                    (0x20000)
-#define MCF_FEC_EIR_XFERR                    (0x40000)
-#define MCF_FEC_EIR_XFUN                     (0x80000)
-#define MCF_FEC_EIR_RL                       (0x100000)
-#define MCF_FEC_EIR_LC                       (0x200000)
-#define MCF_FEC_EIR_MII                      (0x800000)
-#define MCF_FEC_EIR_TXF                      (0x8000000)
-#define MCF_FEC_EIR_GRA                      (0x10000000)
-#define MCF_FEC_EIR_BABT                     (0x20000000)
-#define MCF_FEC_EIR_BABR                     (0x40000000)
-#define MCF_FEC_EIR_HBERR                    (0x80000000)
-#define MCF_FEC_EIR_CLEAR_ALL                (0xFFFFFFFF)
-
-/* Bit definitions and macros for MCF_FEC_EIMR */
-#define MCF_FEC_EIMR_RFERR                   (0x20000)
-#define MCF_FEC_EIMR_XFERR                   (0x40000)
-#define MCF_FEC_EIMR_XFUN                    (0x80000)
-#define MCF_FEC_EIMR_RL                      (0x100000)
-#define MCF_FEC_EIMR_LC                      (0x200000)
-#define MCF_FEC_EIMR_MII                     (0x800000)
-#define MCF_FEC_EIMR_TXF                     (0x8000000)
-#define MCF_FEC_EIMR_GRA                     (0x10000000)
-#define MCF_FEC_EIMR_BABT                    (0x20000000)
-#define MCF_FEC_EIMR_BABR                    (0x40000000)
-#define MCF_FEC_EIMR_HBERR                   (0x80000000)
-#define MCF_FEC_EIMR_MASK_ALL                (0)
-#define MCF_FEC_EIMR_UNMASK_ALL              (0xFFFFFFFF)
-
-/* Bit definitions and macros for MCF_FEC_ECR */
-#define MCF_FEC_ECR_RESET                    (0x1)
-#define MCF_FEC_ECR_ETHER_EN                 (0x2)
-
-/* Bit definitions and macros for MCF_FEC_MMFR */
-#define MCF_FEC_MMFR_DATA(x)                 (((x)&0xFFFF)<<0)
-#define MCF_FEC_MMFR_TA(x)                   (((x)&0x3)<<0x10)
-#define MCF_FEC_MMFR_TA_10                   (0x20000)
-#define MCF_FEC_MMFR_RA(x)                   (((x)&0x1F)<<0x12)
-#define MCF_FEC_MMFR_PA(x)                   (((x)&0x1F)<<0x17)
-#define MCF_FEC_MMFR_OP(x)                   (((x)&0x3)<<0x1C)
-#define MCF_FEC_MMFR_OP_READ                 (0x20000000)
-#define MCF_FEC_MMFR_OP_WRITE                (0x10000000)
-#define MCF_FEC_MMFR_ST(x)                   (((x)&0x3)<<0x1E)
-#define MCF_FEC_MMFR_ST_01                   (0x40000000)
-
-/* Bit definitions and macros for MCF_FEC_MSCR */
-#define MCF_FEC_MSCR_MII_SPEED(x)            (((x)&0x3F)<<0x1)
-#define MCF_FEC_MSCR_DIS_PREAMBLE            (0x80)
-#define MCF_FEC_MSCR_MII_SPEED_133           (0x1B<<0x1)
-#define MCF_FEC_MSCR_MII_SPEED_120           (0x18<<0x1)
-#define MCF_FEC_MSCR_MII_SPEED_66            (0xE<<0x1)
-#define MCF_FEC_MSCR_MII_SPEED_60            (0xC<<0x1)
-
-/* Bit definitions and macros for MCF_FEC_MIBC */
-#define MCF_FEC_MIBC_MIB_IDLE                (0x40000000)
-#define MCF_FEC_MIBC_MIB_DISABLE             (0x80000000)
-
-/* Bit definitions and macros for MCF_FEC_RCR */
-#define MCF_FEC_RCR_LOOP                     (0x1)
-#define MCF_FEC_RCR_DRT                      (0x2)
-#define MCF_FEC_RCR_MII_MODE                 (0x4)
-#define MCF_FEC_RCR_PROM                     (0x8)
-#define MCF_FEC_RCR_BC_REJ                   (0x10)
-#define MCF_FEC_RCR_FCE                      (0x20)
-#define MCF_FEC_RCR_MAX_FL(x)                (((x)&0x7FF)<<0x10)
-
-/* Bit definitions and macros for MCF_FEC_RHR */
-#define MCF_FEC_RHR_HASH(x)                  (((x)&0x3F)<<0x18)
-#define MCF_FEC_RHR_MULTCAST                 (0x40000000)
-#define MCF_FEC_RHR_FCE                      (0x80000000)
-
-/* Bit definitions and macros for MCF_FEC_TCR */
-#define MCF_FEC_TCR_GTS                      (0x1)
-#define MCF_FEC_TCR_HBC                      (0x2)
-#define MCF_FEC_TCR_FDEN                     (0x4)
-#define MCF_FEC_TCR_TFC_PAUSE                (0x8)
-#define MCF_FEC_TCR_RFC_PAUSE                (0x10)
-
-/* Bit definitions and macros for MCF_FEC_PALR */
-#define MCF_FEC_PALR_PADDR1(x)               (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_PAHR */
-#define MCF_FEC_PAHR_TYPE(x)                 (((x)&0xFFFF)<<0)
-#define MCF_FEC_PAHR_PADDR2(x)               (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_FEC_OPD */
-#define MCF_FEC_OPD_PAUSE_DUR(x)             (((x)&0xFFFF)<<0)
-#define MCF_FEC_OPD_OPCODE(x)                (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_FEC_IAUR */
-#define MCF_FEC_IAUR_IADDR1(x)               (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IALR */
-#define MCF_FEC_IALR_IADDR2(x)               (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_GAUR */
-#define MCF_FEC_GAUR_GADDR1(x)               (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_GALR */
-#define MCF_FEC_GALR_GADDR2(x)               (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECTFWR */
-#define MCF_FEC_FECTFWR_X_WMRK(x)            (((x)&0xF)<<0)
-#define MCF_FEC_FECTFWR_X_WMRK_64            (0)
-#define MCF_FEC_FECTFWR_X_WMRK_128           (0x1)
-#define MCF_FEC_FECTFWR_X_WMRK_192           (0x2)
-#define MCF_FEC_FECTFWR_X_WMRK_256           (0x3)
-#define MCF_FEC_FECTFWR_X_WMRK_320           (0x4)
-#define MCF_FEC_FECTFWR_X_WMRK_384           (0x5)
-#define MCF_FEC_FECTFWR_X_WMRK_448           (0x6)
-#define MCF_FEC_FECTFWR_X_WMRK_512           (0x7)
-#define MCF_FEC_FECTFWR_X_WMRK_576           (0x8)
-#define MCF_FEC_FECTFWR_X_WMRK_640           (0x9)
-#define MCF_FEC_FECTFWR_X_WMRK_704           (0xA)
-#define MCF_FEC_FECTFWR_X_WMRK_768           (0xB)
-#define MCF_FEC_FECTFWR_X_WMRK_832           (0xC)
-#define MCF_FEC_FECTFWR_X_WMRK_896           (0xD)
-#define MCF_FEC_FECTFWR_X_WMRK_960           (0xE)
-#define MCF_FEC_FECTFWR_X_WMRK_1024          (0xF)
-
-/* Bit definitions and macros for MCF_FEC_FECRFDR */
-#define MCF_FEC_FECRFDR_FIFO_DATA(x)         (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECRFSR */
-#define MCF_FEC_FECRFSR_EMT                  (0x10000)
-#define MCF_FEC_FECRFSR_ALARM                (0x20000)
-#define MCF_FEC_FECRFSR_FU                   (0x40000)
-#define MCF_FEC_FECRFSR_FRMRDY               (0x80000)
-#define MCF_FEC_FECRFSR_OF                   (0x100000)
-#define MCF_FEC_FECRFSR_UF                   (0x200000)
-#define MCF_FEC_FECRFSR_RXW                  (0x400000)
-#define MCF_FEC_FECRFSR_FAE                  (0x800000)
-#define MCF_FEC_FECRFSR_FRM(x)               (((x)&0xF)<<0x18)
-#define MCF_FEC_FECRFSR_IP                   (0x80000000)
-
-/* Bit definitions and macros for MCF_FEC_FECRFCR */
-#define MCF_FEC_FECRFCR_COUNTER(x)           (((x)&0xFFFF)<<0)
-#define MCF_FEC_FECRFCR_OF_MSK               (0x80000)
-#define MCF_FEC_FECRFCR_UF_MSK               (0x100000)
-#define MCF_FEC_FECRFCR_RXW_MSK              (0x200000)
-#define MCF_FEC_FECRFCR_FAE_MSK              (0x400000)
-#define MCF_FEC_FECRFCR_IP_MSK               (0x800000)
-#define MCF_FEC_FECRFCR_GR(x)                (((x)&0x7)<<0x18)
-#define MCF_FEC_FECRFCR_FRMEN                (0x8000000)
-#define MCF_FEC_FECRFCR_TIMER                (0x10000000)
-
-/* Bit definitions and macros for MCF_FEC_FECRLRFP */
-#define MCF_FEC_FECRLRFP_LRFP(x)             (((x)&0x3FF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECRLWFP */
-#define MCF_FEC_FECRLWFP_LWFP(x)             (((x)&0x3FF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECRFAR */
-#define MCF_FEC_FECRFAR_ALARM(x)             (((x)&0x3FF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECRFRP */
-#define MCF_FEC_FECRFRP_READ(x)              (((x)&0x3FF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECRFWP */
-#define MCF_FEC_FECRFWP_WRITE(x)             (((x)&0x3FF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECTFDR */
-#define MCF_FEC_FECTFDR_FIFO_DATA(x)         (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECTFSR */
-#define MCF_FEC_FECTFSR_EMT                  (0x10000)
-#define MCF_FEC_FECTFSR_ALARM                (0x20000)
-#define MCF_FEC_FECTFSR_FU                   (0x40000)
-#define MCF_FEC_FECTFSR_FRMRDY               (0x80000)
-#define MCF_FEC_FECTFSR_OF                   (0x100000)
-#define MCF_FEC_FECTFSR_UF                   (0x200000)
-#define MCF_FEC_FECTFSR_FAE                  (0x800000)
-#define MCF_FEC_FECTFSR_FRM(x)               (((x)&0xF)<<0x18)
-#define MCF_FEC_FECTFSR_TXW                  (0x40000000)
-#define MCF_FEC_FECTFSR_IP                   (0x80000000)
-
-/* Bit definitions and macros for MCF_FEC_FECTFCR */
-#define MCF_FEC_FECTFCR_RESERVED             (0x200000)
-#define MCF_FEC_FECTFCR_COUNTER(x)           (((x)&0xFFFF)<<0|0x200000)
-#define MCF_FEC_FECTFCR_TXW_MASK             (0x240000)
-#define MCF_FEC_FECTFCR_OF_MSK               (0x280000)
-#define MCF_FEC_FECTFCR_UF_MSK               (0x300000)
-#define MCF_FEC_FECTFCR_FAE_MSK              (0x600000)
-#define MCF_FEC_FECTFCR_IP_MSK               (0xA00000)
-#define MCF_FEC_FECTFCR_GR(x)                (((x)&0x7)<<0x18|0x200000)
-#define MCF_FEC_FECTFCR_FRMEN                (0x8200000)
-#define MCF_FEC_FECTFCR_TIMER                (0x10200000)
-#define MCF_FEC_FECTFCR_WFR                  (0x20200000)
-#define MCF_FEC_FECTFCR_WCTL                 (0x40200000)
-
-/* Bit definitions and macros for MCF_FEC_FECTLRFP */
-#define MCF_FEC_FECTLRFP_LRFP(x)             (((x)&0x3FF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECTLWFP */
-#define MCF_FEC_FECTLWFP_LWFP(x)             (((x)&0x3FF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECTFAR */
-#define MCF_FEC_FECTFAR_ALARM(x)             (((x)&0x3FF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECTFRP */
-#define MCF_FEC_FECTFRP_READ(x)              (((x)&0x3FF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECTFWP */
-#define MCF_FEC_FECTFWP_WRITE(x)             (((x)&0x3FF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_FECFRST */
-#define MCF_FEC_FECFRST_RST_CTL              (0x1000000)
-#define MCF_FEC_FECFRST_SW_RST               (0x2000000)
-
-/* Bit definitions and macros for MCF_FEC_FECCTCWR */
-#define MCF_FEC_FECCTCWR_TFCW                (0x1000000)
-#define MCF_FEC_FECCTCWR_CRC                 (0x2000000)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_DROP */
-#define MCF_FEC_RMON_T_DROP_Value(x)         (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_PACKETS */
-#define MCF_FEC_RMON_T_PACKETS_Value(x)      (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_BC_PKT */
-#define MCF_FEC_RMON_T_BC_PKT_Value(x)       (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_MC_PKT */
-#define MCF_FEC_RMON_T_MC_PKT_Value(x)       (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_CRC_ALIGN */
-#define MCF_FEC_RMON_T_CRC_ALIGN_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_UNDERSIZE */
-#define MCF_FEC_RMON_T_UNDERSIZE_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_OVERSIZE */
-#define MCF_FEC_RMON_T_OVERSIZE_Value(x)     (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_FRAG */
-#define MCF_FEC_RMON_T_FRAG_Value(x)         (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_JAB */
-#define MCF_FEC_RMON_T_JAB_Value(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_COL */
-#define MCF_FEC_RMON_T_COL_Value(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_P64 */
-#define MCF_FEC_RMON_T_P64_Value(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_P65TO127 */
-#define MCF_FEC_RMON_T_P65TO127_Value(x)     (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_P128TO255 */
-#define MCF_FEC_RMON_T_P128TO255_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_P256TO511 */
-#define MCF_FEC_RMON_T_P256TO511_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_P512TO1023 */
-#define MCF_FEC_RMON_T_P512TO1023_Value(x)   (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_P1024TO2047 */
-#define MCF_FEC_RMON_T_P1024TO2047_Value(x)  (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_P_GTE2048 */
-#define MCF_FEC_RMON_T_P_GTE2048_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_T_OCTETS */
-#define MCF_FEC_RMON_T_OCTETS_Value(x)       (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_DROP */
-#define MCF_FEC_IEEE_T_DROP_Value(x)         (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_FRAME_OK */
-#define MCF_FEC_IEEE_T_FRAME_OK_Value(x)     (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_1COL */
-#define MCF_FEC_IEEE_T_1COL_Value(x)         (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_MCOL */
-#define MCF_FEC_IEEE_T_MCOL_Value(x)         (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_DEF */
-#define MCF_FEC_IEEE_T_DEF_Value(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_LCOL */
-#define MCF_FEC_IEEE_T_LCOL_Value(x)         (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_EXCOL */
-#define MCF_FEC_IEEE_T_EXCOL_Value(x)        (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_MACERR */
-#define MCF_FEC_IEEE_T_MACERR_Value(x)       (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_CSERR */
-#define MCF_FEC_IEEE_T_CSERR_Value(x)        (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_SQE */
-#define MCF_FEC_IEEE_T_SQE_Value(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_FDXFC */
-#define MCF_FEC_IEEE_T_FDXFC_Value(x)        (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_T_OCTETS_OK */
-#define MCF_FEC_IEEE_T_OCTETS_OK_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_DROP */
-#define MCF_FEC_RMON_R_DROP_Value(x)         (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_PACKETS */
-#define MCF_FEC_RMON_R_PACKETS_Value(x)      (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_BC_PKT */
-#define MCF_FEC_RMON_R_BC_PKT_Value(x)       (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_MC_PKT */
-#define MCF_FEC_RMON_R_MC_PKT_Value(x)       (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_CRC_ALIGN */
-#define MCF_FEC_RMON_R_CRC_ALIGN_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_UNDERSIZE */
-#define MCF_FEC_RMON_R_UNDERSIZE_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_OVERSIZE */
-#define MCF_FEC_RMON_R_OVERSIZE_Value(x)     (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_FRAG */
-#define MCF_FEC_RMON_R_FRAG_Value(x)         (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_JAB */
-#define MCF_FEC_RMON_R_JAB_Value(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_RESVD_0 */
-#define MCF_FEC_RMON_R_RESVD_0_Value(x)      (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_P64 */
-#define MCF_FEC_RMON_R_P64_Value(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_P65TO127 */
-#define MCF_FEC_RMON_R_P65TO127_Value(x)     (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_P128TO255 */
-#define MCF_FEC_RMON_R_P128TO255_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_P256TO511 */
-#define MCF_FEC_RMON_R_P256TO511_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_P512TO1023 */
-#define MCF_FEC_RMON_R_P512TO1023_Value(x)   (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_P1024TO2047 */
-#define MCF_FEC_RMON_R_P1024TO2047_Value(x)  (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_P_GTE2048 */
-#define MCF_FEC_RMON_R_P_GTE2048_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_RMON_R_OCTETS */
-#define MCF_FEC_RMON_R_OCTETS_Value(x)       (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_R_DROP */
-#define MCF_FEC_IEEE_R_DROP_Value(x)         (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_R_FRAME_OK */
-#define MCF_FEC_IEEE_R_FRAME_OK_Value(x)     (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_R_CRC */
-#define MCF_FEC_IEEE_R_CRC_Value(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_R_ALIGN */
-#define MCF_FEC_IEEE_R_ALIGN_Value(x)        (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_R_MACERR */
-#define MCF_FEC_IEEE_R_MACERR_Value(x)       (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_R_FDXFC */
-#define MCF_FEC_IEEE_R_FDXFC_Value(x)        (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_FEC_IEEE_R_OCTETS_OK */
-#define MCF_FEC_IEEE_R_OCTETS_OK_Value(x)    (((x)&0xFFFFFFFF)<<0)
-
-
-#endif /* __MCF5475_FEC_H__ */
--- a/tos/jtagwait/include/MCF5475_GPIO.h
+++ b/tos/jtagwait/include/MCF5475_GPIO.h
@@ -1,543 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_GPIO_H__
-#define __MCF5475_GPIO_H__
-
-
-/*********************************************************************
-*
-* General Purpose I/O (GPIO)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_GPIO_PODR_FBCTL                  (*(volatile uint8_t *)(&_MBAR[0xA00]))
-#define MCF_GPIO_PDDR_FBCTL                  (*(volatile uint8_t *)(&_MBAR[0xA10]))
-#define MCF_GPIO_PPDSDR_FBCTL                (*(volatile uint8_t *)(&_MBAR[0xA20]))
-#define MCF_GPIO_PCLRR_FBCTL                 (*(volatile uint8_t *)(&_MBAR[0xA30]))
-
-#define MCF_GPIO_PODR_FBCS                   (*(volatile uint8_t *)(&_MBAR[0xA01]))
-#define MCF_GPIO_PDDR_FBCS                   (*(volatile uint8_t *)(&_MBAR[0xA11]))
-#define MCF_GPIO_PPDSDR_FBCS                 (*(volatile uint8_t *)(&_MBAR[0xA21]))
-#define MCF_GPIO_PCLRR_FBCS                  (*(volatile uint8_t *)(&_MBAR[0xA31]))
-
-#define MCF_GPIO_PODR_DMA                    (*(volatile uint8_t *)(&_MBAR[0xA02]))
-#define MCF_GPIO_PDDR_DMA                    (*(volatile uint8_t *)(&_MBAR[0xA12]))
-#define MCF_GPIO_PPDSDR_DMA                  (*(volatile uint8_t *)(&_MBAR[0xA22]))
-#define MCF_GPIO_PCLRR_DMA                   (*(volatile uint8_t *)(&_MBAR[0xA32]))
-
-#define MCF_GPIO_PODR_FEC0H                  (*(volatile uint8_t *)(&_MBAR[0xA04]))
-#define MCF_GPIO_PDDR_FEC0H                  (*(volatile uint8_t *)(&_MBAR[0xA14]))
-#define MCF_GPIO_PPDSDR_FEC0H                (*(volatile uint8_t *)(&_MBAR[0xA24]))
-#define MCF_GPIO_PCLRR_FEC0H                 (*(volatile uint8_t *)(&_MBAR[0xA34]))
-
-#define MCF_GPIO_PODR_FEC0L                  (*(volatile uint8_t *)(&_MBAR[0xA05]))
-#define MCF_GPIO_PDDR_FEC0L                  (*(volatile uint8_t *)(&_MBAR[0xA15]))
-#define MCF_GPIO_PPDSDR_FEC0L                (*(volatile uint8_t *)(&_MBAR[0xA25]))
-#define MCF_GPIO_PCLRR_FEC0L                 (*(volatile uint8_t *)(&_MBAR[0xA35]))
-
-#define MCF_GPIO_PODR_FEC1H                  (*(volatile uint8_t *)(&_MBAR[0xA06]))
-#define MCF_GPIO_PDDR_FEC1H                  (*(volatile uint8_t *)(&_MBAR[0xA16]))
-#define MCF_GPIO_PPDSDR_FEC1H                (*(volatile uint8_t *)(&_MBAR[0xA26]))
-#define MCF_GPIO_PCLRR_FEC1H                 (*(volatile uint8_t *)(&_MBAR[0xA36]))
-
-#define MCF_GPIO_PODR_FEC1L                  (*(volatile uint8_t *)(&_MBAR[0xA07]))
-#define MCF_GPIO_PDDR_FEC1L                  (*(volatile uint8_t *)(&_MBAR[0xA17]))
-#define MCF_GPIO_PPDSDR_FEC1L                (*(volatile uint8_t *)(&_MBAR[0xA27]))
-#define MCF_GPIO_PCLRR_FEC1L                 (*(volatile uint8_t *)(&_MBAR[0xA37]))
-
-#define MCF_GPIO_PODR_FECI2C                 (*(volatile uint8_t *)(&_MBAR[0xA08]))
-#define MCF_GPIO_PDDR_FECI2C                 (*(volatile uint8_t *)(&_MBAR[0xA18]))
-#define MCF_GPIO_PPDSDR_FECI2C               (*(volatile uint8_t *)(&_MBAR[0xA28]))
-#define MCF_GPIO_PCLRR_FECI2C                (*(volatile uint8_t *)(&_MBAR[0xA38]))
-
-#define MCF_GPIO_PODR_PCIBG                  (*(volatile uint8_t *)(&_MBAR[0xA09]))
-#define MCF_GPIO_PDDR_PCIBG                  (*(volatile uint8_t *)(&_MBAR[0xA19]))
-#define MCF_GPIO_PPDSDR_PCIBG                (*(volatile uint8_t *)(&_MBAR[0xA29]))
-#define MCF_GPIO_PCLRR_PCIBG                 (*(volatile uint8_t *)(&_MBAR[0xA39]))
-
-#define MCF_GPIO_PODR_PCIBR                  (*(volatile uint8_t *)(&_MBAR[0xA0A]))
-#define MCF_GPIO_PDDR_PCIBR                  (*(volatile uint8_t *)(&_MBAR[0xA1A]))
-#define MCF_GPIO_PPDSDR_PCIBR                (*(volatile uint8_t *)(&_MBAR[0xA2A]))
-#define MCF_GPIO_PCLRR_PCIBR                 (*(volatile uint8_t *)(&_MBAR[0xA3A]))
-
-#define MCF_GPIO2_PODR_PSC3PSC               (*(volatile uint8_t *)(&_MBAR[0xA0C]))
-#define MCF_GPIO2_PDDR_PSC3PSC               (*(volatile uint8_t *)(&_MBAR[0xA1C]))
-#define MCF_GPIO2_PPDSDR_PSC3PSC             (*(volatile uint8_t *)(&_MBAR[0xA2C]))
-#define MCF_GPIO2_PCLRR_PSC3PSC              (*(volatile uint8_t *)(&_MBAR[0xA3C]))
-
-#define MCF_GPIO0_PODR_PSC1PSC               (*(volatile uint8_t *)(&_MBAR[0xA0D]))
-#define MCF_GPIO0_PDDR_PSC1PSC               (*(volatile uint8_t *)(&_MBAR[0xA1D]))
-#define MCF_GPIO0_PPDSDR_PSC1PSC             (*(volatile uint8_t *)(&_MBAR[0xA2D]))
-#define MCF_GPIO0_PCLRR_PSC1PSC              (*(volatile uint8_t *)(&_MBAR[0xA3D]))
-
-#define MCF_GPIO_PODR_DSPI                   (*(volatile uint8_t *)(&_MBAR[0xA0E]))
-#define MCF_GPIO_PDDR_DSPI                   (*(volatile uint8_t *)(&_MBAR[0xA1E]))
-#define MCF_GPIO_PPDSDR_DSPI                 (*(volatile uint8_t *)(&_MBAR[0xA2E]))
-#define MCF_GPIO_PCLRR_DSPI                  (*(volatile uint8_t *)(&_MBAR[0xA3E]))
-
-
-
-/* Bit definitions and macros for MCF_GPIO_PODR_FBCTL */
-#define MCF_GPIO_PODR_FBCTL_PODR_FBCTL0      (0x1)
-#define MCF_GPIO_PODR_FBCTL_PODR_FBCTL1      (0x2)
-#define MCF_GPIO_PODR_FBCTL_PODR_FBCTL2      (0x4)
-#define MCF_GPIO_PODR_FBCTL_PODR_FBCTL3      (0x8)
-#define MCF_GPIO_PODR_FBCTL_PODR_FBCTL4      (0x10)
-#define MCF_GPIO_PODR_FBCTL_PODR_FBCTL5      (0x20)
-#define MCF_GPIO_PODR_FBCTL_PODR_FBCTL6      (0x40)
-#define MCF_GPIO_PODR_FBCTL_PODR_FBCTL7      (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_FBCTL */
-#define MCF_GPIO_PDDR_FBCTL_PDDR_FBCTL0      (0x1)
-#define MCF_GPIO_PDDR_FBCTL_PDDR_FBCTL1      (0x2)
-#define MCF_GPIO_PDDR_FBCTL_PDDR_FBCTL2      (0x4)
-#define MCF_GPIO_PDDR_FBCTL_PDDR_FBCTL3      (0x8)
-#define MCF_GPIO_PDDR_FBCTL_PDDR_FBCTL4      (0x10)
-#define MCF_GPIO_PDDR_FBCTL_PDDR_FBCTL5      (0x20)
-#define MCF_GPIO_PDDR_FBCTL_PDDR_FBCTL6      (0x40)
-#define MCF_GPIO_PDDR_FBCTL_PDDR_FBCTL7      (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_FBCTL */
-#define MCF_GPIO_PPDSDR_FBCTL_PPDSDR_FBCTL0  (0x1)
-#define MCF_GPIO_PPDSDR_FBCTL_PPDSDR_FBCTL1  (0x2)
-#define MCF_GPIO_PPDSDR_FBCTL_PPDSDR_FBCTL2  (0x4)
-#define MCF_GPIO_PPDSDR_FBCTL_PPDSDR_FBCTL3  (0x8)
-#define MCF_GPIO_PPDSDR_FBCTL_PPDSDR_FBCTL4  (0x10)
-#define MCF_GPIO_PPDSDR_FBCTL_PPDSDR_FBCTL5  (0x20)
-#define MCF_GPIO_PPDSDR_FBCTL_PPDSDR_FBCTL6  (0x40)
-#define MCF_GPIO_PPDSDR_FBCTL_PPDSDR_FBCTL7  (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_FBCTL */
-#define MCF_GPIO_PCLRR_FBCTL_PCLRR_FBCTL0    (0x1)
-#define MCF_GPIO_PCLRR_FBCTL_PCLRR_FBCTL1    (0x2)
-#define MCF_GPIO_PCLRR_FBCTL_PCLRR_FBCTL2    (0x4)
-#define MCF_GPIO_PCLRR_FBCTL_PCLRR_FBCTL3    (0x8)
-#define MCF_GPIO_PCLRR_FBCTL_PCLRR_FBCTL4    (0x10)
-#define MCF_GPIO_PCLRR_FBCTL_PCLRR_FBCTL5    (0x20)
-#define MCF_GPIO_PCLRR_FBCTL_PCLRR_FBCTL6    (0x40)
-#define MCF_GPIO_PCLRR_FBCTL_PCLRR_FBCTL7    (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_FBCS */
-#define MCF_GPIO_PODR_FBCS_PODR_FBCS1        (0x2)
-#define MCF_GPIO_PODR_FBCS_PODR_FBCS2        (0x4)
-#define MCF_GPIO_PODR_FBCS_PODR_FBCS3        (0x8)
-#define MCF_GPIO_PODR_FBCS_PODR_FBCS4        (0x10)
-#define MCF_GPIO_PODR_FBCS_PODR_FBCS5        (0x20)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_FBCS */
-#define MCF_GPIO_PDDR_FBCS_PDDR_FBCS1        (0x2)
-#define MCF_GPIO_PDDR_FBCS_PDDR_FBCS2        (0x4)
-#define MCF_GPIO_PDDR_FBCS_PDDR_FBCS3        (0x8)
-#define MCF_GPIO_PDDR_FBCS_PDDR_FBCS4        (0x10)
-#define MCF_GPIO_PDDR_FBCS_PDDR_FBCS5        (0x20)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_FBCS */
-#define MCF_GPIO_PPDSDR_FBCS_PPDSDR_FBCS1    (0x2)
-#define MCF_GPIO_PPDSDR_FBCS_PPDSDR_FBCS2    (0x4)
-#define MCF_GPIO_PPDSDR_FBCS_PPDSDR_FBCS3    (0x8)
-#define MCF_GPIO_PPDSDR_FBCS_PPDSDR_FBCS4    (0x10)
-#define MCF_GPIO_PPDSDR_FBCS_PPDSDR_FBCS5    (0x20)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_FBCS */
-#define MCF_GPIO_PCLRR_FBCS_PCLRR_FBCS1      (0x2)
-#define MCF_GPIO_PCLRR_FBCS_PCLRR_FBCS2      (0x4)
-#define MCF_GPIO_PCLRR_FBCS_PCLRR_FBCS3      (0x8)
-#define MCF_GPIO_PCLRR_FBCS_PCLRR_FBCS4      (0x10)
-#define MCF_GPIO_PCLRR_FBCS_PCLRR_FBCS5      (0x20)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_DMA */
-#define MCF_GPIO_PODR_DMA_PODR_DMA0          (0x1)
-#define MCF_GPIO_PODR_DMA_PODR_DMA1          (0x2)
-#define MCF_GPIO_PODR_DMA_PODR_DMA2          (0x4)
-#define MCF_GPIO_PODR_DMA_PODR_DMA3          (0x8)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_DMA */
-#define MCF_GPIO_PDDR_DMA_PDDR_DMA0          (0x1)
-#define MCF_GPIO_PDDR_DMA_PDDR_DMA1          (0x2)
-#define MCF_GPIO_PDDR_DMA_PDDR_DMA2          (0x4)
-#define MCF_GPIO_PDDR_DMA_PDDR_DMA3          (0x8)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_DMA */
-#define MCF_GPIO_PPDSDR_DMA_PPDSDR_DMA0      (0x1)
-#define MCF_GPIO_PPDSDR_DMA_PPDSDR_DMA1      (0x2)
-#define MCF_GPIO_PPDSDR_DMA_PPDSDR_DMA2      (0x4)
-#define MCF_GPIO_PPDSDR_DMA_PPDSDR_DMA3      (0x8)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_DMA */
-#define MCF_GPIO_PCLRR_DMA_PCLRR_DMA0        (0x1)
-#define MCF_GPIO_PCLRR_DMA_PCLRR_DMA1        (0x2)
-#define MCF_GPIO_PCLRR_DMA_PCLRR_DMA2        (0x4)
-#define MCF_GPIO_PCLRR_DMA_PCLRR_DMA3        (0x8)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_FEC0H */
-#define MCF_GPIO_PODR_FEC0H_PODR_FEC0H0      (0x1)
-#define MCF_GPIO_PODR_FEC0H_PODR_FEC0H1      (0x2)
-#define MCF_GPIO_PODR_FEC0H_PODR_FEC0H2      (0x4)
-#define MCF_GPIO_PODR_FEC0H_PODR_FEC0H3      (0x8)
-#define MCF_GPIO_PODR_FEC0H_PODR_FEC0H4      (0x10)
-#define MCF_GPIO_PODR_FEC0H_PODR_FEC0H5      (0x20)
-#define MCF_GPIO_PODR_FEC0H_PODR_FEC0H6      (0x40)
-#define MCF_GPIO_PODR_FEC0H_PODR_FEC0H7      (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_FEC0H */
-#define MCF_GPIO_PDDR_FEC0H_PDDR_FEC0H0      (0x1)
-#define MCF_GPIO_PDDR_FEC0H_PDDR_FEC0H1      (0x2)
-#define MCF_GPIO_PDDR_FEC0H_PDDR_FEC0H2      (0x4)
-#define MCF_GPIO_PDDR_FEC0H_PDDR_FEC0H3      (0x8)
-#define MCF_GPIO_PDDR_FEC0H_PDDR_FEC0H4      (0x10)
-#define MCF_GPIO_PDDR_FEC0H_PDDR_FEC0H5      (0x20)
-#define MCF_GPIO_PDDR_FEC0H_PDDR_FEC0H6      (0x40)
-#define MCF_GPIO_PDDR_FEC0H_PDDR_FEC0H7      (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_FEC0H */
-#define MCF_GPIO_PPDSDR_FEC0H_PPDSDR_FEC0H0  (0x1)
-#define MCF_GPIO_PPDSDR_FEC0H_PPDSDR_FEC0H1  (0x2)
-#define MCF_GPIO_PPDSDR_FEC0H_PPDSDR_FEC0H2  (0x4)
-#define MCF_GPIO_PPDSDR_FEC0H_PPDSDR_FEC0H3  (0x8)
-#define MCF_GPIO_PPDSDR_FEC0H_PPDSDR_FEC0H4  (0x10)
-#define MCF_GPIO_PPDSDR_FEC0H_PPDSDR_FEC0H5  (0x20)
-#define MCF_GPIO_PPDSDR_FEC0H_PPDSDR_FEC0H6  (0x40)
-#define MCF_GPIO_PPDSDR_FEC0H_PPDSDR_FEC0H7  (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_FEC0H */
-#define MCF_GPIO_PCLRR_FEC0H_PCLRR_FEC0H0    (0x1)
-#define MCF_GPIO_PCLRR_FEC0H_PCLRR_FEC0H1    (0x2)
-#define MCF_GPIO_PCLRR_FEC0H_PCLRR_FEC0H2    (0x4)
-#define MCF_GPIO_PCLRR_FEC0H_PCLRR_FEC0H3    (0x8)
-#define MCF_GPIO_PCLRR_FEC0H_PCLRR_FEC0H4    (0x10)
-#define MCF_GPIO_PCLRR_FEC0H_PCLRR_FEC0H5    (0x20)
-#define MCF_GPIO_PCLRR_FEC0H_PCLRR_FEC0H6    (0x40)
-#define MCF_GPIO_PCLRR_FEC0H_PCLRR_FEC0H7    (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_FEC0L */
-#define MCF_GPIO_PODR_FEC0L_PODR_FEC0L0      (0x1)
-#define MCF_GPIO_PODR_FEC0L_PODR_FEC0L1      (0x2)
-#define MCF_GPIO_PODR_FEC0L_PODR_FEC0L2      (0x4)
-#define MCF_GPIO_PODR_FEC0L_PODR_FEC0L3      (0x8)
-#define MCF_GPIO_PODR_FEC0L_PODR_FEC0L4      (0x10)
-#define MCF_GPIO_PODR_FEC0L_PODR_FEC0L5      (0x20)
-#define MCF_GPIO_PODR_FEC0L_PODR_FEC0L6      (0x40)
-#define MCF_GPIO_PODR_FEC0L_PODR_FEC0L7      (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_FEC0L */
-#define MCF_GPIO_PDDR_FEC0L_PDDR_FEC0L0      (0x1)
-#define MCF_GPIO_PDDR_FEC0L_PDDR_FEC0L1      (0x2)
-#define MCF_GPIO_PDDR_FEC0L_PDDR_FEC0L2      (0x4)
-#define MCF_GPIO_PDDR_FEC0L_PDDR_FEC0L3      (0x8)
-#define MCF_GPIO_PDDR_FEC0L_PDDR_FEC0L4      (0x10)
-#define MCF_GPIO_PDDR_FEC0L_PDDR_FEC0L5      (0x20)
-#define MCF_GPIO_PDDR_FEC0L_PDDR_FEC0L6      (0x40)
-#define MCF_GPIO_PDDR_FEC0L_PDDR_FEC0L7      (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_FEC0L */
-#define MCF_GPIO_PPDSDR_FEC0L_PPDSDR_FEC0L0  (0x1)
-#define MCF_GPIO_PPDSDR_FEC0L_PPDSDR_FEC0L1  (0x2)
-#define MCF_GPIO_PPDSDR_FEC0L_PPDSDR_FEC0L2  (0x4)
-#define MCF_GPIO_PPDSDR_FEC0L_PPDSDR_FEC0L3  (0x8)
-#define MCF_GPIO_PPDSDR_FEC0L_PPDSDR_FEC0L4  (0x10)
-#define MCF_GPIO_PPDSDR_FEC0L_PPDSDR_FEC0L5  (0x20)
-#define MCF_GPIO_PPDSDR_FEC0L_PPDSDR_FEC0L6  (0x40)
-#define MCF_GPIO_PPDSDR_FEC0L_PPDSDR_FEC0L7  (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_FEC0L */
-#define MCF_GPIO_PCLRR_FEC0L_PCLRR_FEC0L0    (0x1)
-#define MCF_GPIO_PCLRR_FEC0L_PCLRR_FEC0L1    (0x2)
-#define MCF_GPIO_PCLRR_FEC0L_PCLRR_FEC0L2    (0x4)
-#define MCF_GPIO_PCLRR_FEC0L_PCLRR_FEC0L3    (0x8)
-#define MCF_GPIO_PCLRR_FEC0L_PCLRR_FEC0L4    (0x10)
-#define MCF_GPIO_PCLRR_FEC0L_PCLRR_FEC0L5    (0x20)
-#define MCF_GPIO_PCLRR_FEC0L_PCLRR_FEC0L6    (0x40)
-#define MCF_GPIO_PCLRR_FEC0L_PCLRR_FEC0L7    (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_FEC1H */
-#define MCF_GPIO_PODR_FEC1H_PODR_FEC1H0      (0x1)
-#define MCF_GPIO_PODR_FEC1H_PODR_FEC1H1      (0x2)
-#define MCF_GPIO_PODR_FEC1H_PODR_FEC1H2      (0x4)
-#define MCF_GPIO_PODR_FEC1H_PODR_FEC1H3      (0x8)
-#define MCF_GPIO_PODR_FEC1H_PODR_FEC1H4      (0x10)
-#define MCF_GPIO_PODR_FEC1H_PODR_FEC1H5      (0x20)
-#define MCF_GPIO_PODR_FEC1H_PODR_FEC1H6      (0x40)
-#define MCF_GPIO_PODR_FEC1H_PODR_FEC1H7      (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_FEC1H */
-#define MCF_GPIO_PDDR_FEC1H_PDDR_FEC1H0      (0x1)
-#define MCF_GPIO_PDDR_FEC1H_PDDR_FEC1H1      (0x2)
-#define MCF_GPIO_PDDR_FEC1H_PDDR_FEC1H2      (0x4)
-#define MCF_GPIO_PDDR_FEC1H_PDDR_FEC1H3      (0x8)
-#define MCF_GPIO_PDDR_FEC1H_PDDR_FEC1H4      (0x10)
-#define MCF_GPIO_PDDR_FEC1H_PDDR_FEC1H5      (0x20)
-#define MCF_GPIO_PDDR_FEC1H_PDDR_FEC1H6      (0x40)
-#define MCF_GPIO_PDDR_FEC1H_PDDR_FEC1H7      (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_FEC1H */
-#define MCF_GPIO_PPDSDR_FEC1H_PPDSDR_FEC1H0  (0x1)
-#define MCF_GPIO_PPDSDR_FEC1H_PPDSDR_FEC1H1  (0x2)
-#define MCF_GPIO_PPDSDR_FEC1H_PPDSDR_FEC1H2  (0x4)
-#define MCF_GPIO_PPDSDR_FEC1H_PPDSDR_FEC1H3  (0x8)
-#define MCF_GPIO_PPDSDR_FEC1H_PPDSDR_FEC1H4  (0x10)
-#define MCF_GPIO_PPDSDR_FEC1H_PPDSDR_FEC1H5  (0x20)
-#define MCF_GPIO_PPDSDR_FEC1H_PPDSDR_FEC1H6  (0x40)
-#define MCF_GPIO_PPDSDR_FEC1H_PPDSDR_FEC1H7  (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_FEC1H */
-#define MCF_GPIO_PCLRR_FEC1H_PCLRR_FEC1H0    (0x1)
-#define MCF_GPIO_PCLRR_FEC1H_PCLRR_FEC1H1    (0x2)
-#define MCF_GPIO_PCLRR_FEC1H_PCLRR_FEC1H2    (0x4)
-#define MCF_GPIO_PCLRR_FEC1H_PCLRR_FEC1H3    (0x8)
-#define MCF_GPIO_PCLRR_FEC1H_PCLRR_FEC1H4    (0x10)
-#define MCF_GPIO_PCLRR_FEC1H_PCLRR_FEC1H5    (0x20)
-#define MCF_GPIO_PCLRR_FEC1H_PCLRR_FEC1H6    (0x40)
-#define MCF_GPIO_PCLRR_FEC1H_PCLRR_FEC1H7    (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_FEC1L */
-#define MCF_GPIO_PODR_FEC1L_PODR_FEC1L0      (0x1)
-#define MCF_GPIO_PODR_FEC1L_PODR_FEC1L1      (0x2)
-#define MCF_GPIO_PODR_FEC1L_PODR_FEC1L2      (0x4)
-#define MCF_GPIO_PODR_FEC1L_PODR_FEC1L3      (0x8)
-#define MCF_GPIO_PODR_FEC1L_PODR_FEC1L4      (0x10)
-#define MCF_GPIO_PODR_FEC1L_PODR_FEC1L5      (0x20)
-#define MCF_GPIO_PODR_FEC1L_PODR_FEC1L6      (0x40)
-#define MCF_GPIO_PODR_FEC1L_PODR_FEC1L7      (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_FEC1L */
-#define MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L0      (0x1)
-#define MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L1      (0x2)
-#define MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L2      (0x4)
-#define MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L3      (0x8)
-#define MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L4      (0x10)
-#define MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L5      (0x20)
-#define MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L6      (0x40)
-#define MCF_GPIO_PDDR_FEC1L_PDDR_FEC1L7      (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_FEC1L */
-#define MCF_GPIO_PPDSDR_FEC1L_PPDSDR_FEC1L0  (0x1)
-#define MCF_GPIO_PPDSDR_FEC1L_PPDSDR_FEC1L1  (0x2)
-#define MCF_GPIO_PPDSDR_FEC1L_PPDSDR_FEC1L2  (0x4)
-#define MCF_GPIO_PPDSDR_FEC1L_PPDSDR_FEC1L3  (0x8)
-#define MCF_GPIO_PPDSDR_FEC1L_PPDSDR_FEC1L4  (0x10)
-#define MCF_GPIO_PPDSDR_FEC1L_PPDSDR_FEC1L5  (0x20)
-#define MCF_GPIO_PPDSDR_FEC1L_PPDSDR_FEC1L6  (0x40)
-#define MCF_GPIO_PPDSDR_FEC1L_PPDSDR_FEC1L7  (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_FEC1L */
-#define MCF_GPIO_PCLRR_FEC1L_PCLRR_FEC1L0    (0x1)
-#define MCF_GPIO_PCLRR_FEC1L_PCLRR_FEC1L1    (0x2)
-#define MCF_GPIO_PCLRR_FEC1L_PCLRR_FEC1L2    (0x4)
-#define MCF_GPIO_PCLRR_FEC1L_PCLRR_FEC1L3    (0x8)
-#define MCF_GPIO_PCLRR_FEC1L_PCLRR_FEC1L4    (0x10)
-#define MCF_GPIO_PCLRR_FEC1L_PCLRR_FEC1L5    (0x20)
-#define MCF_GPIO_PCLRR_FEC1L_PCLRR_FEC1L6    (0x40)
-#define MCF_GPIO_PCLRR_FEC1L_PCLRR_FEC1L7    (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_FECI2C */
-#define MCF_GPIO_PODR_FECI2C_PODR_FECI2C0    (0x1)
-#define MCF_GPIO_PODR_FECI2C_PODR_FECI2C1    (0x2)
-#define MCF_GPIO_PODR_FECI2C_PODR_FECI2C2    (0x4)
-#define MCF_GPIO_PODR_FECI2C_PODR_FECI2C3    (0x8)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_FECI2C */
-#define MCF_GPIO_PDDR_FECI2C_PDDR_FECI2C0    (0x1)
-#define MCF_GPIO_PDDR_FECI2C_PDDR_FECI2C1    (0x2)
-#define MCF_GPIO_PDDR_FECI2C_PDDR_FECI2C2    (0x4)
-#define MCF_GPIO_PDDR_FECI2C_PDDR_FECI2C3    (0x8)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_FECI2C */
-#define MCF_GPIO_PPDSDR_FECI2C_PPDSDR_FECI2C0 (0x1)
-#define MCF_GPIO_PPDSDR_FECI2C_PPDSDR_FECI2C1 (0x2)
-#define MCF_GPIO_PPDSDR_FECI2C_PPDSDR_FECI2C2 (0x4)
-#define MCF_GPIO_PPDSDR_FECI2C_PPDSDR_FECI2C3 (0x8)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_FECI2C */
-#define MCF_GPIO_PCLRR_FECI2C_PCLRR_FECI2C0  (0x1)
-#define MCF_GPIO_PCLRR_FECI2C_PCLRR_FECI2C1  (0x2)
-#define MCF_GPIO_PCLRR_FECI2C_PCLRR_FECI2C2  (0x4)
-#define MCF_GPIO_PCLRR_FECI2C_PCLRR_FECI2C3  (0x8)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_PCIBG */
-#define MCF_GPIO_PODR_PCIBG_PODR_PCIBG0      (0x1)
-#define MCF_GPIO_PODR_PCIBG_PODR_PCIBG1      (0x2)
-#define MCF_GPIO_PODR_PCIBG_PODR_PCIBG2      (0x4)
-#define MCF_GPIO_PODR_PCIBG_PODR_PCIBG3      (0x8)
-#define MCF_GPIO_PODR_PCIBG_PODR_PCIBG4      (0x10)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_PCIBG */
-#define MCF_GPIO_PDDR_PCIBG_PDDR_PCIBG0      (0x1)
-#define MCF_GPIO_PDDR_PCIBG_PDDR_PCIBG1      (0x2)
-#define MCF_GPIO_PDDR_PCIBG_PDDR_PCIBG2      (0x4)
-#define MCF_GPIO_PDDR_PCIBG_PDDR_PCIBG3      (0x8)
-#define MCF_GPIO_PDDR_PCIBG_PDDR_PCIBG4      (0x10)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_PCIBG */
-#define MCF_GPIO_PPDSDR_PCIBG_PPDSDR_PCIBG0  (0x1)
-#define MCF_GPIO_PPDSDR_PCIBG_PPDSDR_PCIBG1  (0x2)
-#define MCF_GPIO_PPDSDR_PCIBG_PPDSDR_PCIBG2  (0x4)
-#define MCF_GPIO_PPDSDR_PCIBG_PPDSDR_PCIBG3  (0x8)
-#define MCF_GPIO_PPDSDR_PCIBG_PPDSDR_PCIBG4  (0x10)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_PCIBG */
-#define MCF_GPIO_PCLRR_PCIBG_PCLRR_PCIBG0    (0x1)
-#define MCF_GPIO_PCLRR_PCIBG_PCLRR_PCIBG1    (0x2)
-#define MCF_GPIO_PCLRR_PCIBG_PCLRR_PCIBG2    (0x4)
-#define MCF_GPIO_PCLRR_PCIBG_PCLRR_PCIBG3    (0x8)
-#define MCF_GPIO_PCLRR_PCIBG_PCLRR_PCIBG4    (0x10)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_PCIBR */
-#define MCF_GPIO_PODR_PCIBR_PODR_PCIBR0      (0x1)
-#define MCF_GPIO_PODR_PCIBR_PODR_PCIBR1      (0x2)
-#define MCF_GPIO_PODR_PCIBR_PODR_PCIBR2      (0x4)
-#define MCF_GPIO_PODR_PCIBR_PODR_PCIBR3      (0x8)
-#define MCF_GPIO_PODR_PCIBR_PODR_PCIBR4      (0x10)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_PCIBR */
-#define MCF_GPIO_PDDR_PCIBR_PDDR_PCIBR0      (0x1)
-#define MCF_GPIO_PDDR_PCIBR_PDDR_PCIBR1      (0x2)
-#define MCF_GPIO_PDDR_PCIBR_PDDR_PCIBR2      (0x4)
-#define MCF_GPIO_PDDR_PCIBR_PDDR_PCIBR3      (0x8)
-#define MCF_GPIO_PDDR_PCIBR_PDDR_PCIBR4      (0x10)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_PCIBR */
-#define MCF_GPIO_PPDSDR_PCIBR_PPDSDR_PCIBR0  (0x1)
-#define MCF_GPIO_PPDSDR_PCIBR_PPDSDR_PCIBR1  (0x2)
-#define MCF_GPIO_PPDSDR_PCIBR_PPDSDR_PCIBR2  (0x4)
-#define MCF_GPIO_PPDSDR_PCIBR_PPDSDR_PCIBR3  (0x8)
-#define MCF_GPIO_PPDSDR_PCIBR_PPDSDR_PCIBR4  (0x10)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_PCIBR */
-#define MCF_GPIO_PCLRR_PCIBR_PCLRR_PCIBR0    (0x1)
-#define MCF_GPIO_PCLRR_PCIBR_PCLRR_PCIBR1    (0x2)
-#define MCF_GPIO_PCLRR_PCIBR_PCLRR_PCIBR2    (0x4)
-#define MCF_GPIO_PCLRR_PCIBR_PCLRR_PCIBR3    (0x8)
-#define MCF_GPIO_PCLRR_PCIBR_PCLRR_PCIBR4    (0x10)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_PSC3PSC */
-#define MCF_GPIO_PODR_PSC3PSC_PODR_PSC3PSC20 (0x1)
-#define MCF_GPIO_PODR_PSC3PSC_PODR_PSC3PSC21 (0x2)
-#define MCF_GPIO_PODR_PSC3PSC_PODR_PSC3PSC22 (0x4)
-#define MCF_GPIO_PODR_PSC3PSC_PODR_PSC3PSC23 (0x8)
-#define MCF_GPIO_PODR_PSC3PSC_PODR_PSC3PSC24 (0x10)
-#define MCF_GPIO_PODR_PSC3PSC_PODR_PSC3PSC25 (0x20)
-#define MCF_GPIO_PODR_PSC3PSC_PODR_PSC3PSC26 (0x40)
-#define MCF_GPIO_PODR_PSC3PSC_PODR_PSC3PSC27 (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_PSC3PSC */
-#define MCF_GPIO_PDDR_PSC3PSC_PDDR_PSC3PSC20 (0x1)
-#define MCF_GPIO_PDDR_PSC3PSC_PDDR_PSC3PSC21 (0x2)
-#define MCF_GPIO_PDDR_PSC3PSC_PDDR_PSC3PSC22 (0x4)
-#define MCF_GPIO_PDDR_PSC3PSC_PDDR_PSC3PSC23 (0x8)
-#define MCF_GPIO_PDDR_PSC3PSC_PDDR_PSC3PSC24 (0x10)
-#define MCF_GPIO_PDDR_PSC3PSC_PDDR_PSC3PSC25 (0x20)
-#define MCF_GPIO_PDDR_PSC3PSC_PDDR_PSC3PSC26 (0x40)
-#define MCF_GPIO_PDDR_PSC3PSC_PDDR_PSC3PSC27 (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_PSC3PSC */
-#define MCF_GPIO_PPDSDR_PSC3PSC_PPDSDR_PSC3PSC20 (0x1)
-#define MCF_GPIO_PPDSDR_PSC3PSC_PPDSDR_PSC3PSC21 (0x2)
-#define MCF_GPIO_PPDSDR_PSC3PSC_PPDSDR_PSC3PSC22 (0x4)
-#define MCF_GPIO_PPDSDR_PSC3PSC_PPDSDR_PSC3PSC23 (0x8)
-#define MCF_GPIO_PPDSDR_PSC3PSC_PPDSDR_PSC3PSC24 (0x10)
-#define MCF_GPIO_PPDSDR_PSC3PSC_PPDSDR_PSC3PSC25 (0x20)
-#define MCF_GPIO_PPDSDR_PSC3PSC_PPDSDR_PSC3PSC26 (0x40)
-#define MCF_GPIO_PPDSDR_PSC3PSC_PPDSDR_PSC3PSC27 (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_PSC3PSC */
-#define MCF_GPIO_PCLRR_PSC3PSC_PCLRR_PSC3PSC20 (0x1)
-#define MCF_GPIO_PCLRR_PSC3PSC_PCLRR_PSC3PSC21 (0x2)
-#define MCF_GPIO_PCLRR_PSC3PSC_PCLRR_PSC3PSC22 (0x4)
-#define MCF_GPIO_PCLRR_PSC3PSC_PCLRR_PSC3PSC23 (0x8)
-#define MCF_GPIO_PCLRR_PSC3PSC_PCLRR_PSC3PSC24 (0x10)
-#define MCF_GPIO_PCLRR_PSC3PSC_PCLRR_PSC3PSC25 (0x20)
-#define MCF_GPIO_PCLRR_PSC3PSC_PCLRR_PSC3PSC26 (0x40)
-#define MCF_GPIO_PCLRR_PSC3PSC_PCLRR_PSC3PSC27 (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_PSC1PSC */
-#define MCF_GPIO_PODR_PSC1PSC_PODR_PSC1PSC00 (0x1)
-#define MCF_GPIO_PODR_PSC1PSC_PODR_PSC1PSC01 (0x2)
-#define MCF_GPIO_PODR_PSC1PSC_PODR_PSC1PSC02 (0x4)
-#define MCF_GPIO_PODR_PSC1PSC_PODR_PSC1PSC03 (0x8)
-#define MCF_GPIO_PODR_PSC1PSC_PODR_PSC1PSC04 (0x10)
-#define MCF_GPIO_PODR_PSC1PSC_PODR_PSC1PSC05 (0x20)
-#define MCF_GPIO_PODR_PSC1PSC_PODR_PSC1PSC06 (0x40)
-#define MCF_GPIO_PODR_PSC1PSC_PODR_PSC1PSC07 (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_PSC1PSC */
-#define MCF_GPIO_PDDR_PSC1PSC_PDDR_PSC1PSC00 (0x1)
-#define MCF_GPIO_PDDR_PSC1PSC_PDDR_PSC1PSC01 (0x2)
-#define MCF_GPIO_PDDR_PSC1PSC_PDDR_PSC1PSC02 (0x4)
-#define MCF_GPIO_PDDR_PSC1PSC_PDDR_PSC1PSC03 (0x8)
-#define MCF_GPIO_PDDR_PSC1PSC_PDDR_PSC1PSC04 (0x10)
-#define MCF_GPIO_PDDR_PSC1PSC_PDDR_PSC1PSC05 (0x20)
-#define MCF_GPIO_PDDR_PSC1PSC_PDDR_PSC1PSC06 (0x40)
-#define MCF_GPIO_PDDR_PSC1PSC_PDDR_PSC1PSC07 (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_PSC1PSC */
-#define MCF_GPIO_PPDSDR_PSC1PSC_PPDSDR_PSC1PSC00 (0x1)
-#define MCF_GPIO_PPDSDR_PSC1PSC_PPDSDR_PSC1PSC01 (0x2)
-#define MCF_GPIO_PPDSDR_PSC1PSC_PPDSDR_PSC1PSC02 (0x4)
-#define MCF_GPIO_PPDSDR_PSC1PSC_PPDSDR_PSC1PSC03 (0x8)
-#define MCF_GPIO_PPDSDR_PSC1PSC_PPDSDR_PSC1PSC04 (0x10)
-#define MCF_GPIO_PPDSDR_PSC1PSC_PPDSDR_PSC1PSC05 (0x20)
-#define MCF_GPIO_PPDSDR_PSC1PSC_PPDSDR_PSC1PSC06 (0x40)
-#define MCF_GPIO_PPDSDR_PSC1PSC_PPDSDR_PSC1PSC07 (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_PSC1PSC */
-#define MCF_GPIO_PCLRR_PSC1PSC_PCLRR_PSC1PSC00 (0x1)
-#define MCF_GPIO_PCLRR_PSC1PSC_PCLRR_PSC1PSC01 (0x2)
-#define MCF_GPIO_PCLRR_PSC1PSC_PCLRR_PSC1PSC02 (0x4)
-#define MCF_GPIO_PCLRR_PSC1PSC_PCLRR_PSC1PSC03 (0x8)
-#define MCF_GPIO_PCLRR_PSC1PSC_PCLRR_PSC1PSC04 (0x10)
-#define MCF_GPIO_PCLRR_PSC1PSC_PCLRR_PSC1PSC05 (0x20)
-#define MCF_GPIO_PCLRR_PSC1PSC_PCLRR_PSC1PSC06 (0x40)
-#define MCF_GPIO_PCLRR_PSC1PSC_PCLRR_PSC1PSC07 (0x80)
-
-/* Bit definitions and macros for MCF_GPIO_PODR_DSPI */
-#define MCF_GPIO_PODR_DSPI_PODR_DSPI0        (0x1)
-#define MCF_GPIO_PODR_DSPI_PODR_DSPI1        (0x2)
-#define MCF_GPIO_PODR_DSPI_PODR_DSPI2        (0x4)
-#define MCF_GPIO_PODR_DSPI_PODR_DSPI3        (0x8)
-#define MCF_GPIO_PODR_DSPI_PODR_DSPI4        (0x10)
-#define MCF_GPIO_PODR_DSPI_PODR_DSPI5        (0x20)
-#define MCF_GPIO_PODR_DSPI_PODR_DSPI6        (0x40)
-
-/* Bit definitions and macros for MCF_GPIO_PDDR_DSPI */
-#define MCF_GPIO_PDDR_DSPI_PDDR_DSPI0        (0x1)
-#define MCF_GPIO_PDDR_DSPI_PDDR_DSPI1        (0x2)
-#define MCF_GPIO_PDDR_DSPI_PDDR_DSPI2        (0x4)
-#define MCF_GPIO_PDDR_DSPI_PDDR_DSPI3        (0x8)
-#define MCF_GPIO_PDDR_DSPI_PDDR_DSPI4        (0x10)
-#define MCF_GPIO_PDDR_DSPI_PDDR_DSPI5        (0x20)
-#define MCF_GPIO_PDDR_DSPI_PDDR_DSPI6        (0x40)
-
-/* Bit definitions and macros for MCF_GPIO_PPDSDR_DSPI */
-#define MCF_GPIO_PPDSDR_DSPI_PPDSDR_DSPI0    (0x1)
-#define MCF_GPIO_PPDSDR_DSPI_PPDSDR_DSPI1    (0x2)
-#define MCF_GPIO_PPDSDR_DSPI_PPDSDR_DSPI2    (0x4)
-#define MCF_GPIO_PPDSDR_DSPI_PPDSDR_DSPI3    (0x8)
-#define MCF_GPIO_PPDSDR_DSPI_PPDSDR_DSPI4    (0x10)
-#define MCF_GPIO_PPDSDR_DSPI_PPDSDR_DSPI5    (0x20)
-#define MCF_GPIO_PPDSDR_DSPI_PPDSDR_DSPI6    (0x40)
-
-/* Bit definitions and macros for MCF_GPIO_PCLRR_DSPI */
-#define MCF_GPIO_PCLRR_DSPI_PCLRR_DSPI0      (0x1)
-#define MCF_GPIO_PCLRR_DSPI_PCLRR_DSPI1      (0x2)
-#define MCF_GPIO_PCLRR_DSPI_PCLRR_DSPI2      (0x4)
-#define MCF_GPIO_PCLRR_DSPI_PCLRR_DSPI3      (0x8)
-#define MCF_GPIO_PCLRR_DSPI_PCLRR_DSPI4      (0x10)
-#define MCF_GPIO_PCLRR_DSPI_PCLRR_DSPI5      (0x20)
-#define MCF_GPIO_PCLRR_DSPI_PCLRR_DSPI6      (0x40)
-
-
-#endif /* __MCF5475_GPIO_H__ */
--- a/tos/jtagwait/include/MCF5475_GPT.h
+++ b/tos/jtagwait/include/MCF5475_GPT.h
@@ -1,100 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_GPT_H__
-#define __MCF5475_GPT_H__
-
-
-/*********************************************************************
-*
-* General Purpose Timers (GPT)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_GPT0_GMS                         (*(volatile uint32_t*)(&_MBAR[0x800]))
-#define MCF_GPT0_GCIR                        (*(volatile uint32_t*)(&_MBAR[0x804]))
-#define MCF_GPT0_GPWM                        (*(volatile uint32_t*)(&_MBAR[0x808]))
-#define MCF_GPT0_GSR                         (*(volatile uint32_t*)(&_MBAR[0x80C]))
-
-#define MCF_GPT1_GMS                         (*(volatile uint32_t*)(&_MBAR[0x810]))
-#define MCF_GPT1_GCIR                        (*(volatile uint32_t*)(&_MBAR[0x814]))
-#define MCF_GPT1_GPWM                        (*(volatile uint32_t*)(&_MBAR[0x818]))
-#define MCF_GPT1_GSR                         (*(volatile uint32_t*)(&_MBAR[0x81C]))
-
-#define MCF_GPT2_GMS                         (*(volatile uint32_t*)(&_MBAR[0x820]))
-#define MCF_GPT2_GCIR                        (*(volatile uint32_t*)(&_MBAR[0x824]))
-#define MCF_GPT2_GPWM                        (*(volatile uint32_t*)(&_MBAR[0x828]))
-#define MCF_GPT2_GSR                         (*(volatile uint32_t*)(&_MBAR[0x82C]))
-
-#define MCF_GPT3_GMS                         (*(volatile uint32_t*)(&_MBAR[0x830]))
-#define MCF_GPT3_GCIR                        (*(volatile uint32_t*)(&_MBAR[0x834]))
-#define MCF_GPT3_GPWM                        (*(volatile uint32_t*)(&_MBAR[0x838]))
-#define MCF_GPT3_GSR                         (*(volatile uint32_t*)(&_MBAR[0x83C]))
-
-#define MCF_GPT_GMS(x)                       (*(volatile uint32_t*)(&_MBAR[0x800 + ((x)*0x10)]))
-#define MCF_GPT_GCIR(x)                      (*(volatile uint32_t*)(&_MBAR[0x804 + ((x)*0x10)]))
-#define MCF_GPT_GPWM(x)                      (*(volatile uint32_t*)(&_MBAR[0x808 + ((x)*0x10)]))
-#define MCF_GPT_GSR(x)                       (*(volatile uint32_t*)(&_MBAR[0x80C + ((x)*0x10)]))
-
-
-/* Bit definitions and macros for MCF_GPT_GMS */
-#define MCF_GPT_GMS_TMS(x)                   (((x)&0x7)<<0)
-#define MCF_GPT_GMS_TMS_DISABLE              (0)
-#define MCF_GPT_GMS_TMS_INCAPT               (0x1)
-#define MCF_GPT_GMS_TMS_OUTCAPT              (0x2)
-#define MCF_GPT_GMS_TMS_PWM                  (0x3)
-#define MCF_GPT_GMS_TMS_GPIO                 (0x4)
-#define MCF_GPT_GMS_GPIO(x)                  (((x)&0x3)<<0x4)
-#define MCF_GPT_GMS_GPIO_INPUT               (0)
-#define MCF_GPT_GMS_GPIO_OUTLO               (0x20)
-#define MCF_GPT_GMS_GPIO_OUTHI               (0x30)
-#define MCF_GPT_GMS_IEN                      (0x100)
-#define MCF_GPT_GMS_OD                       (0x200)
-#define MCF_GPT_GMS_SC                       (0x400)
-#define MCF_GPT_GMS_CE                       (0x1000)
-#define MCF_GPT_GMS_WDEN                     (0x8000)
-#define MCF_GPT_GMS_ICT(x)                   (((x)&0x3)<<0x10)
-#define MCF_GPT_GMS_ICT_ANY                  (0)
-#define MCF_GPT_GMS_ICT_RISE                 (0x10000)
-#define MCF_GPT_GMS_ICT_FALL                 (0x20000)
-#define MCF_GPT_GMS_ICT_PULSE                (0x30000)
-#define MCF_GPT_GMS_OCT(x)                   (((x)&0x3)<<0x14)
-#define MCF_GPT_GMS_OCT_FRCLOW               (0)
-#define MCF_GPT_GMS_OCT_PULSEHI              (0x100000)
-#define MCF_GPT_GMS_OCT_PULSELO              (0x200000)
-#define MCF_GPT_GMS_OCT_TOGGLE               (0x300000)
-#define MCF_GPT_GMS_OCPW(x)                  (((x)&0xFF)<<0x18)
-
-/* Bit definitions and macros for MCF_GPT_GCIR */
-#define MCF_GPT_GCIR_CNT(x)                  (((x)&0xFFFF)<<0)
-#define MCF_GPT_GCIR_PRE(x)                  (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_GPT_GPWM */
-#define MCF_GPT_GPWM_LOAD                    (0x1)
-#define MCF_GPT_GPWM_PWMOP                   (0x100)
-#define MCF_GPT_GPWM_WIDTH(x)                (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_GPT_GSR */
-#define MCF_GPT_GSR_CAPT                     (0x1)
-#define MCF_GPT_GSR_COMP                     (0x2)
-#define MCF_GPT_GSR_PWMP                     (0x4)
-#define MCF_GPT_GSR_TEXP                     (0x8)
-#define MCF_GPT_GSR_PIN                      (0x100)
-#define MCF_GPT_GSR_OVF(x)                   (((x)&0x7)<<0xC)
-#define MCF_GPT_GSR_CAPTURE(x)               (((x)&0xFFFF)<<0x10)
-
-
-#endif /* __MCF5475_GPT_H__ */
--- a/tos/jtagwait/include/MCF5475_I2C.h
+++ b/tos/jtagwait/include/MCF5475_I2C.h
@@ -1,69 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_I2C_H__
-#define __MCF5475_I2C_H__
-
-
-/*********************************************************************
-*
-* I2C Module (I2C)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_I2C_I2ADR                        (*(volatile uint8_t *)(&_MBAR[0x8F00]))
-#define MCF_I2C_I2FDR                        (*(volatile uint8_t *)(&_MBAR[0x8F04]))
-#define MCF_I2C_I2CR                         (*(volatile uint8_t *)(&_MBAR[0x8F08]))
-#define MCF_I2C_I2SR                         (*(volatile uint8_t *)(&_MBAR[0x8F0C]))
-#define MCF_I2C_I2DR                         (*(volatile uint8_t *)(&_MBAR[0x8F10]))
-#define MCF_I2C_I2ICR                        (*(volatile uint8_t *)(&_MBAR[0x8F20]))
-
-
-
-/* Bit definitions and macros for MCF_I2C_I2ADR */
-#define MCF_I2C_I2ADR_ADR(x)                 (((x)&0x7F)<<0x1)
-
-/* Bit definitions and macros for MCF_I2C_I2FDR */
-#define MCF_I2C_I2FDR_IC(x)                  (((x)&0x3F)<<0)
-
-/* Bit definitions and macros for MCF_I2C_I2CR */
-#define MCF_I2C_I2CR_RSTA                    (0x4)
-#define MCF_I2C_I2CR_TXAK                    (0x8)
-#define MCF_I2C_I2CR_MTX                     (0x10)
-#define MCF_I2C_I2CR_MSTA                    (0x20)
-#define MCF_I2C_I2CR_IIEN                    (0x40)
-#define MCF_I2C_I2CR_IEN                     (0x80)
-
-/* Bit definitions and macros for MCF_I2C_I2SR */
-#define MCF_I2C_I2SR_RXAK                    (0x1)
-#define MCF_I2C_I2SR_IIF                     (0x2)
-#define MCF_I2C_I2SR_SRW                     (0x4)
-#define MCF_I2C_I2SR_IAL                     (0x10)
-#define MCF_I2C_I2SR_IBB                     (0x20)
-#define MCF_I2C_I2SR_IAAS                    (0x40)
-#define MCF_I2C_I2SR_ICF                     (0x80)
-
-/* Bit definitions and macros for MCF_I2C_I2DR */
-#define MCF_I2C_I2DR_DATA(x)                 (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_I2C_I2ICR */
-#define MCF_I2C_I2ICR_IE                     (0x1)
-#define MCF_I2C_I2ICR_RE                     (0x2)
-#define MCF_I2C_I2ICR_TE                     (0x4)
-#define MCF_I2C_I2ICR_BNBE                   (0x8)
-
-
-#endif /* __MCF5475_I2C_H__ */
--- a/tos/jtagwait/include/MCF5475_INTC.h
+++ b/tos/jtagwait/include/MCF5475_INTC.h
@@ -1,331 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_INTC_H__
-#define __MCF5475_INTC_H__
-
-
-/*********************************************************************
-*
-* Interrupt Controller (INTC)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_INTC_IPRH                        (*(volatile uint32_t*)(&_MBAR[0x700]))
-#define MCF_INTC_IPRL                        (*(volatile uint32_t*)(&_MBAR[0x704]))
-#define MCF_INTC_IMRH                        (*(volatile uint32_t*)(&_MBAR[0x708]))
-#define MCF_INTC_IMRL                        (*(volatile uint32_t*)(&_MBAR[0x70C]))
-#define MCF_INTC_INTFRCH                     (*(volatile uint32_t*)(&_MBAR[0x710]))
-#define MCF_INTC_INTFRCL                     (*(volatile uint32_t*)(&_MBAR[0x714]))
-#define MCF_INTC_IRLR                        (*(volatile uint8_t *)(&_MBAR[0x718]))
-#define MCF_INTC_IACKLPR                     (*(volatile uint8_t *)(&_MBAR[0x719]))
-#define MCF_INTC_ICR01                       (*(volatile uint8_t *)(&_MBAR[0x741]))
-#define MCF_INTC_ICR02                       (*(volatile uint8_t *)(&_MBAR[0x742]))
-#define MCF_INTC_ICR03                       (*(volatile uint8_t *)(&_MBAR[0x743]))
-#define MCF_INTC_ICR04                       (*(volatile uint8_t *)(&_MBAR[0x744]))
-#define MCF_INTC_ICR05                       (*(volatile uint8_t *)(&_MBAR[0x745]))
-#define MCF_INTC_ICR06                       (*(volatile uint8_t *)(&_MBAR[0x746]))
-#define MCF_INTC_ICR07                       (*(volatile uint8_t *)(&_MBAR[0x747]))
-#define MCF_INTC_ICR08                       (*(volatile uint8_t *)(&_MBAR[0x748]))
-#define MCF_INTC_ICR09                       (*(volatile uint8_t *)(&_MBAR[0x749]))
-#define MCF_INTC_ICR10                       (*(volatile uint8_t *)(&_MBAR[0x74A]))
-#define MCF_INTC_ICR11                       (*(volatile uint8_t *)(&_MBAR[0x74B]))
-#define MCF_INTC_ICR12                       (*(volatile uint8_t *)(&_MBAR[0x74C]))
-#define MCF_INTC_ICR13                       (*(volatile uint8_t *)(&_MBAR[0x74D]))
-#define MCF_INTC_ICR14                       (*(volatile uint8_t *)(&_MBAR[0x74E]))
-#define MCF_INTC_ICR15                       (*(volatile uint8_t *)(&_MBAR[0x74F]))
-#define MCF_INTC_ICR16                       (*(volatile uint8_t *)(&_MBAR[0x750]))
-#define MCF_INTC_ICR17                       (*(volatile uint8_t *)(&_MBAR[0x751]))
-#define MCF_INTC_ICR18                       (*(volatile uint8_t *)(&_MBAR[0x752]))
-#define MCF_INTC_ICR19                       (*(volatile uint8_t *)(&_MBAR[0x753]))
-#define MCF_INTC_ICR20                       (*(volatile uint8_t *)(&_MBAR[0x754]))
-#define MCF_INTC_ICR21                       (*(volatile uint8_t *)(&_MBAR[0x755]))
-#define MCF_INTC_ICR22                       (*(volatile uint8_t *)(&_MBAR[0x756]))
-#define MCF_INTC_ICR23                       (*(volatile uint8_t *)(&_MBAR[0x757]))
-#define MCF_INTC_ICR24                       (*(volatile uint8_t *)(&_MBAR[0x758]))
-#define MCF_INTC_ICR25                       (*(volatile uint8_t *)(&_MBAR[0x759]))
-#define MCF_INTC_ICR26                       (*(volatile uint8_t *)(&_MBAR[0x75A]))
-#define MCF_INTC_ICR27                       (*(volatile uint8_t *)(&_MBAR[0x75B]))
-#define MCF_INTC_ICR28                       (*(volatile uint8_t *)(&_MBAR[0x75C]))
-#define MCF_INTC_ICR29                       (*(volatile uint8_t *)(&_MBAR[0x75D]))
-#define MCF_INTC_ICR30                       (*(volatile uint8_t *)(&_MBAR[0x75E]))
-#define MCF_INTC_ICR31                       (*(volatile uint8_t *)(&_MBAR[0x75F]))
-#define MCF_INTC_ICR32                       (*(volatile uint8_t *)(&_MBAR[0x760]))
-#define MCF_INTC_ICR33                       (*(volatile uint8_t *)(&_MBAR[0x761]))
-#define MCF_INTC_ICR34                       (*(volatile uint8_t *)(&_MBAR[0x762]))
-#define MCF_INTC_ICR35                       (*(volatile uint8_t *)(&_MBAR[0x763]))
-#define MCF_INTC_ICR36                       (*(volatile uint8_t *)(&_MBAR[0x764]))
-#define MCF_INTC_ICR37                       (*(volatile uint8_t *)(&_MBAR[0x765]))
-#define MCF_INTC_ICR38                       (*(volatile uint8_t *)(&_MBAR[0x766]))
-#define MCF_INTC_ICR39                       (*(volatile uint8_t *)(&_MBAR[0x767]))
-#define MCF_INTC_ICR40                       (*(volatile uint8_t *)(&_MBAR[0x768]))
-#define MCF_INTC_ICR41                       (*(volatile uint8_t *)(&_MBAR[0x769]))
-#define MCF_INTC_ICR42                       (*(volatile uint8_t *)(&_MBAR[0x76A]))
-#define MCF_INTC_ICR43                       (*(volatile uint8_t *)(&_MBAR[0x76B]))
-#define MCF_INTC_ICR44                       (*(volatile uint8_t *)(&_MBAR[0x76C]))
-#define MCF_INTC_ICR45                       (*(volatile uint8_t *)(&_MBAR[0x76D]))
-#define MCF_INTC_ICR46                       (*(volatile uint8_t *)(&_MBAR[0x76E]))
-#define MCF_INTC_ICR47                       (*(volatile uint8_t *)(&_MBAR[0x76F]))
-#define MCF_INTC_ICR48                       (*(volatile uint8_t *)(&_MBAR[0x770]))
-#define MCF_INTC_ICR49                       (*(volatile uint8_t *)(&_MBAR[0x771]))
-#define MCF_INTC_ICR50                       (*(volatile uint8_t *)(&_MBAR[0x772]))
-#define MCF_INTC_ICR51                       (*(volatile uint8_t *)(&_MBAR[0x773]))
-#define MCF_INTC_ICR52                       (*(volatile uint8_t *)(&_MBAR[0x774]))
-#define MCF_INTC_ICR53                       (*(volatile uint8_t *)(&_MBAR[0x775]))
-#define MCF_INTC_ICR54                       (*(volatile uint8_t *)(&_MBAR[0x776]))
-#define MCF_INTC_ICR55                       (*(volatile uint8_t *)(&_MBAR[0x777]))
-#define MCF_INTC_ICR56                       (*(volatile uint8_t *)(&_MBAR[0x778]))
-#define MCF_INTC_ICR57                       (*(volatile uint8_t *)(&_MBAR[0x779]))
-#define MCF_INTC_ICR58                       (*(volatile uint8_t *)(&_MBAR[0x77A]))
-#define MCF_INTC_ICR59                       (*(volatile uint8_t *)(&_MBAR[0x77B]))
-#define MCF_INTC_ICR60                       (*(volatile uint8_t *)(&_MBAR[0x77C]))
-#define MCF_INTC_ICR61                       (*(volatile uint8_t *)(&_MBAR[0x77D]))
-#define MCF_INTC_ICR62                       (*(volatile uint8_t *)(&_MBAR[0x77E]))
-#define MCF_INTC_ICR63                       (*(volatile uint8_t *)(&_MBAR[0x77F]))
-#define MCF_INTC_SWIACK                      (*(volatile uint8_t *)(&_MBAR[0x7E0]))
-#define MCF_INTC_L1IACK                      (*(volatile uint8_t *)(&_MBAR[0x7E4]))
-#define MCF_INTC_L2IACK                      (*(volatile uint8_t *)(&_MBAR[0x7E8]))
-#define MCF_INTC_L3IACK                      (*(volatile uint8_t *)(&_MBAR[0x7EC]))
-#define MCF_INTC_L4IACK                      (*(volatile uint8_t *)(&_MBAR[0x7F0]))
-#define MCF_INTC_L5IACK                      (*(volatile uint8_t *)(&_MBAR[0x7F4]))
-#define MCF_INTC_L6IACK                      (*(volatile uint8_t *)(&_MBAR[0x7F8]))
-#define MCF_INTC_L7IACK                      (*(volatile uint8_t *)(&_MBAR[0x7FC]))
-#define MCF_INTC_ICR(x)                      (*(volatile uint8_t *)(&_MBAR[0x741 + ((x-1)*0x1)]))
-#define MCF_INTC_LIACK(x)                    (*(volatile uint8_t *)(&_MBAR[0x7E4 + ((x-1)*0x4)]))
-
-
-
-/* Bit definitions and macros for MCF_INTC_IPRH */
-#define MCF_INTC_IPRH_INT32                  (0x1)
-#define MCF_INTC_IPRH_INT33                  (0x2)
-#define MCF_INTC_IPRH_INT34                  (0x4)
-#define MCF_INTC_IPRH_INT35                  (0x8)
-#define MCF_INTC_IPRH_INT36                  (0x10)
-#define MCF_INTC_IPRH_INT37                  (0x20)
-#define MCF_INTC_IPRH_INT38                  (0x40)
-#define MCF_INTC_IPRH_INT39                  (0x80)
-#define MCF_INTC_IPRH_INT40                  (0x100)
-#define MCF_INTC_IPRH_INT41                  (0x200)
-#define MCF_INTC_IPRH_INT42                  (0x400)
-#define MCF_INTC_IPRH_INT43                  (0x800)
-#define MCF_INTC_IPRH_INT44                  (0x1000)
-#define MCF_INTC_IPRH_INT45                  (0x2000)
-#define MCF_INTC_IPRH_INT46                  (0x4000)
-#define MCF_INTC_IPRH_INT47                  (0x8000)
-#define MCF_INTC_IPRH_INT48                  (0x10000)
-#define MCF_INTC_IPRH_INT49                  (0x20000)
-#define MCF_INTC_IPRH_INT50                  (0x40000)
-#define MCF_INTC_IPRH_INT51                  (0x80000)
-#define MCF_INTC_IPRH_INT52                  (0x100000)
-#define MCF_INTC_IPRH_INT53                  (0x200000)
-#define MCF_INTC_IPRH_INT54                  (0x400000)
-#define MCF_INTC_IPRH_INT55                  (0x800000)
-#define MCF_INTC_IPRH_INT56                  (0x1000000)
-#define MCF_INTC_IPRH_INT57                  (0x2000000)
-#define MCF_INTC_IPRH_INT58                  (0x4000000)
-#define MCF_INTC_IPRH_INT59                  (0x8000000)
-#define MCF_INTC_IPRH_INT60                  (0x10000000)
-#define MCF_INTC_IPRH_INT61                  (0x20000000)
-#define MCF_INTC_IPRH_INT62                  (0x40000000)
-#define MCF_INTC_IPRH_INT63                  (0x80000000)
-
-/* Bit definitions and macros for MCF_INTC_IPRL */
-#define MCF_INTC_IPRL_INT1                   (0x2)
-#define MCF_INTC_IPRL_INT2                   (0x4)
-#define MCF_INTC_IPRL_INT3                   (0x8)
-#define MCF_INTC_IPRL_INT4                   (0x10)
-#define MCF_INTC_IPRL_INT5                   (0x20)
-#define MCF_INTC_IPRL_INT6                   (0x40)
-#define MCF_INTC_IPRL_INT7                   (0x80)
-#define MCF_INTC_IPRL_INT8                   (0x100)
-#define MCF_INTC_IPRL_INT9                   (0x200)
-#define MCF_INTC_IPRL_INT10                  (0x400)
-#define MCF_INTC_IPRL_INT11                  (0x800)
-#define MCF_INTC_IPRL_INT12                  (0x1000)
-#define MCF_INTC_IPRL_INT13                  (0x2000)
-#define MCF_INTC_IPRL_INT14                  (0x4000)
-#define MCF_INTC_IPRL_INT15                  (0x8000)
-#define MCF_INTC_IPRL_INT16                  (0x10000)
-#define MCF_INTC_IPRL_INT17                  (0x20000)
-#define MCF_INTC_IPRL_INT18                  (0x40000)
-#define MCF_INTC_IPRL_INT19                  (0x80000)
-#define MCF_INTC_IPRL_INT20                  (0x100000)
-#define MCF_INTC_IPRL_INT21                  (0x200000)
-#define MCF_INTC_IPRL_INT22                  (0x400000)
-#define MCF_INTC_IPRL_INT23                  (0x800000)
-#define MCF_INTC_IPRL_INT24                  (0x1000000)
-#define MCF_INTC_IPRL_INT25                  (0x2000000)
-#define MCF_INTC_IPRL_INT26                  (0x4000000)
-#define MCF_INTC_IPRL_INT27                  (0x8000000)
-#define MCF_INTC_IPRL_INT28                  (0x10000000)
-#define MCF_INTC_IPRL_INT29                  (0x20000000)
-#define MCF_INTC_IPRL_INT30                  (0x40000000)
-#define MCF_INTC_IPRL_INT31                  (0x80000000)
-
-/* Bit definitions and macros for MCF_INTC_IMRH */
-#define MCF_INTC_IMRH_INT_MASK32             (0x1)
-#define MCF_INTC_IMRH_INT_MASK33             (0x2)
-#define MCF_INTC_IMRH_INT_MASK34             (0x4)
-#define MCF_INTC_IMRH_INT_MASK35             (0x8)
-#define MCF_INTC_IMRH_INT_MASK36             (0x10)
-#define MCF_INTC_IMRH_INT_MASK37             (0x20)
-#define MCF_INTC_IMRH_INT_MASK38             (0x40)
-#define MCF_INTC_IMRH_INT_MASK39             (0x80)
-#define MCF_INTC_IMRH_INT_MASK40             (0x100)
-#define MCF_INTC_IMRH_INT_MASK41             (0x200)
-#define MCF_INTC_IMRH_INT_MASK42             (0x400)
-#define MCF_INTC_IMRH_INT_MASK43             (0x800)
-#define MCF_INTC_IMRH_INT_MASK44             (0x1000)
-#define MCF_INTC_IMRH_INT_MASK45             (0x2000)
-#define MCF_INTC_IMRH_INT_MASK46             (0x4000)
-#define MCF_INTC_IMRH_INT_MASK47             (0x8000)
-#define MCF_INTC_IMRH_INT_MASK48             (0x10000)
-#define MCF_INTC_IMRH_INT_MASK49             (0x20000)
-#define MCF_INTC_IMRH_INT_MASK50             (0x40000)
-#define MCF_INTC_IMRH_INT_MASK51             (0x80000)
-#define MCF_INTC_IMRH_INT_MASK52             (0x100000)
-#define MCF_INTC_IMRH_INT_MASK53             (0x200000)
-#define MCF_INTC_IMRH_INT_MASK54             (0x400000)
-#define MCF_INTC_IMRH_INT_MASK55             (0x800000)
-#define MCF_INTC_IMRH_INT_MASK56             (0x1000000)
-#define MCF_INTC_IMRH_INT_MASK57             (0x2000000)
-#define MCF_INTC_IMRH_INT_MASK58             (0x4000000)
-#define MCF_INTC_IMRH_INT_MASK59             (0x8000000)
-#define MCF_INTC_IMRH_INT_MASK60             (0x10000000)
-#define MCF_INTC_IMRH_INT_MASK61             (0x20000000)
-#define MCF_INTC_IMRH_INT_MASK62             (0x40000000)
-#define MCF_INTC_IMRH_INT_MASK63             (0x80000000)
-
-/* Bit definitions and macros for MCF_INTC_IMRL */
-#define MCF_INTC_IMRL_MASKALL                (0x1)
-#define MCF_INTC_IMRL_INT_MASK1              (0x2)
-#define MCF_INTC_IMRL_INT_MASK2              (0x4)
-#define MCF_INTC_IMRL_INT_MASK3              (0x8)
-#define MCF_INTC_IMRL_INT_MASK4              (0x10)
-#define MCF_INTC_IMRL_INT_MASK5              (0x20)
-#define MCF_INTC_IMRL_INT_MASK6              (0x40)
-#define MCF_INTC_IMRL_INT_MASK7              (0x80)
-#define MCF_INTC_IMRL_INT_MASK8              (0x100)
-#define MCF_INTC_IMRL_INT_MASK9              (0x200)
-#define MCF_INTC_IMRL_INT_MASK10             (0x400)
-#define MCF_INTC_IMRL_INT_MASK11             (0x800)
-#define MCF_INTC_IMRL_INT_MASK12             (0x1000)
-#define MCF_INTC_IMRL_INT_MASK13             (0x2000)
-#define MCF_INTC_IMRL_INT_MASK14             (0x4000)
-#define MCF_INTC_IMRL_INT_MASK15             (0x8000)
-#define MCF_INTC_IMRL_INT_MASK16             (0x10000)
-#define MCF_INTC_IMRL_INT_MASK17             (0x20000)
-#define MCF_INTC_IMRL_INT_MASK18             (0x40000)
-#define MCF_INTC_IMRL_INT_MASK19             (0x80000)
-#define MCF_INTC_IMRL_INT_MASK20             (0x100000)
-#define MCF_INTC_IMRL_INT_MASK21             (0x200000)
-#define MCF_INTC_IMRL_INT_MASK22             (0x400000)
-#define MCF_INTC_IMRL_INT_MASK23             (0x800000)
-#define MCF_INTC_IMRL_INT_MASK24             (0x1000000)
-#define MCF_INTC_IMRL_INT_MASK25             (0x2000000)
-#define MCF_INTC_IMRL_INT_MASK26             (0x4000000)
-#define MCF_INTC_IMRL_INT_MASK27             (0x8000000)
-#define MCF_INTC_IMRL_INT_MASK28             (0x10000000)
-#define MCF_INTC_IMRL_INT_MASK29             (0x20000000)
-#define MCF_INTC_IMRL_INT_MASK30             (0x40000000)
-#define MCF_INTC_IMRL_INT_MASK31             (0x80000000)
-
-/* Bit definitions and macros for MCF_INTC_INTFRCH */
-#define MCF_INTC_INTFRCH_INTFRC32            (0x1)
-#define MCF_INTC_INTFRCH_INTFRC33            (0x2)
-#define MCF_INTC_INTFRCH_INTFRC34            (0x4)
-#define MCF_INTC_INTFRCH_INTFRC35            (0x8)
-#define MCF_INTC_INTFRCH_INTFRC36            (0x10)
-#define MCF_INTC_INTFRCH_INTFRC37            (0x20)
-#define MCF_INTC_INTFRCH_INTFRC38            (0x40)
-#define MCF_INTC_INTFRCH_INTFRC39            (0x80)
-#define MCF_INTC_INTFRCH_INTFRC40            (0x100)
-#define MCF_INTC_INTFRCH_INTFRC41            (0x200)
-#define MCF_INTC_INTFRCH_INTFRC42            (0x400)
-#define MCF_INTC_INTFRCH_INTFRC43            (0x800)
-#define MCF_INTC_INTFRCH_INTFRC44            (0x1000)
-#define MCF_INTC_INTFRCH_INTFRC45            (0x2000)
-#define MCF_INTC_INTFRCH_INTFRC46            (0x4000)
-#define MCF_INTC_INTFRCH_INTFRC47            (0x8000)
-#define MCF_INTC_INTFRCH_INTFRC48            (0x10000)
-#define MCF_INTC_INTFRCH_INTFRC49            (0x20000)
-#define MCF_INTC_INTFRCH_INTFRC50            (0x40000)
-#define MCF_INTC_INTFRCH_INTFRC51            (0x80000)
-#define MCF_INTC_INTFRCH_INTFRC52            (0x100000)
-#define MCF_INTC_INTFRCH_INTFRC53            (0x200000)
-#define MCF_INTC_INTFRCH_INTFRC54            (0x400000)
-#define MCF_INTC_INTFRCH_INTFRC55            (0x800000)
-#define MCF_INTC_INTFRCH_INTFRC56            (0x1000000)
-#define MCF_INTC_INTFRCH_INTFRC57            (0x2000000)
-#define MCF_INTC_INTFRCH_INTFRC58            (0x4000000)
-#define MCF_INTC_INTFRCH_INTFRC59            (0x8000000)
-#define MCF_INTC_INTFRCH_INTFRC60            (0x10000000)
-#define MCF_INTC_INTFRCH_INTFRC61            (0x20000000)
-#define MCF_INTC_INTFRCH_INTFRC62            (0x40000000)
-#define MCF_INTC_INTFRCH_INTFRC63            (0x80000000)
-
-/* Bit definitions and macros for MCF_INTC_INTFRCL */
-#define MCF_INTC_INTFRCL_INTFRC1             (0x2)
-#define MCF_INTC_INTFRCL_INTFRC2             (0x4)
-#define MCF_INTC_INTFRCL_INTFRC3             (0x8)
-#define MCF_INTC_INTFRCL_INTFRC4             (0x10)
-#define MCF_INTC_INTFRCL_INTFRC5             (0x20)
-#define MCF_INTC_INTFRCL_INTFRC6             (0x40)
-#define MCF_INTC_INTFRCL_INTFRC7             (0x80)
-#define MCF_INTC_INTFRCL_INTFRC8             (0x100)
-#define MCF_INTC_INTFRCL_INTFRC9             (0x200)
-#define MCF_INTC_INTFRCL_INTFRC10            (0x400)
-#define MCF_INTC_INTFRCL_INTFRC11            (0x800)
-#define MCF_INTC_INTFRCL_INTFRC12            (0x1000)
-#define MCF_INTC_INTFRCL_INTFRC13            (0x2000)
-#define MCF_INTC_INTFRCL_INTFRC14            (0x4000)
-#define MCF_INTC_INTFRCL_INTFRC15            (0x8000)
-#define MCF_INTC_INTFRCL_INTFRC16            (0x10000)
-#define MCF_INTC_INTFRCL_INTFRC17            (0x20000)
-#define MCF_INTC_INTFRCL_INTFRC18            (0x40000)
-#define MCF_INTC_INTFRCL_INTFRC19            (0x80000)
-#define MCF_INTC_INTFRCL_INTFRC20            (0x100000)
-#define MCF_INTC_INTFRCL_INTFRC21            (0x200000)
-#define MCF_INTC_INTFRCL_INTFRC22            (0x400000)
-#define MCF_INTC_INTFRCL_INTFRC23            (0x800000)
-#define MCF_INTC_INTFRCL_INTFRC24            (0x1000000)
-#define MCF_INTC_INTFRCL_INTFRC25            (0x2000000)
-#define MCF_INTC_INTFRCL_INTFRC26            (0x4000000)
-#define MCF_INTC_INTFRCL_INTFRC27            (0x8000000)
-#define MCF_INTC_INTFRCL_INTFRC28            (0x10000000)
-#define MCF_INTC_INTFRCL_INTFRC29            (0x20000000)
-#define MCF_INTC_INTFRCL_INTFRC30            (0x40000000)
-#define MCF_INTC_INTFRCL_INTFRC31            (0x80000000)
-
-/* Bit definitions and macros for MCF_INTC_IRLR */
-#define MCF_INTC_IRLR_IRQ(x)                 (((x)&0x7F)<<0x1)
-
-/* Bit definitions and macros for MCF_INTC_IACKLPR */
-#define MCF_INTC_IACKLPR_PRI(x)              (((x)&0xF)<<0)
-#define MCF_INTC_IACKLPR_LEVEL(x)            (((x)&0x7)<<0x4)
-
-/* Bit definitions and macros for MCF_INTC_ICR */
-#define MCF_INTC_ICR_IP(x)                   (((x)&0x7)<<0)
-#define MCF_INTC_ICR_IL(x)                   (((x)&0x7)<<0x3)
-
-/* Bit definitions and macros for MCF_INTC_SWIACK */
-#define MCF_INTC_SWIACK_VECTOR(x)            (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_INTC_LIACK */
-#define MCF_INTC_LIACK_VECTOR(x)             (((x)&0xFF)<<0)
-
-
-#endif /* __MCF5475_INTC_H__ */
--- a/tos/jtagwait/include/MCF5475_MMU.h
+++ b/tos/jtagwait/include/MCF5475_MMU.h
@@ -1,79 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_MMU_H__
-#define __MCF5475_MMU_H__
-
-
-/*********************************************************************
-*
-* Memory Management Unit (MMU)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-
-/* note the uint32_t_a - this is to avoid gcc warnings about pointer aliasing */
-#define MCF_MMU_MMUCR                        (*(volatile uint32_t_a*)(&_MMUBAR[0]))
-#define MCF_MMU_MMUOR                        (*(volatile uint32_t_a*)(&_MMUBAR[0x4]))
-#define MCF_MMU_MMUSR                        (*(volatile uint32_t_a*)(&_MMUBAR[0x8]))
-#define MCF_MMU_MMUAR                        (*(volatile uint32_t_a*)(&_MMUBAR[0x10]))
-#define MCF_MMU_MMUTR                        (*(volatile uint32_t_a*)(&_MMUBAR[0x14]))
-#define MCF_MMU_MMUDR                        (*(volatile uint32_t_a*)(&_MMUBAR[0x18]))
-
-
-/* Bit definitions and macros for MCF_MMU_MMUCR */
-#define MCF_MMU_MMUCR_EN                     (0x1)
-#define MCF_MMU_MMUCR_ASM                    (0x2)
-
-/* Bit definitions and macros for MCF_MMU_MMUOR */
-#define MCF_MMU_MMUOR_UAA                    (0x1)
-#define MCF_MMU_MMUOR_ACC                    (0x2)
-#define MCF_MMU_MMUOR_RW                     (0x4)
-#define MCF_MMU_MMUOR_ADR                    (0x8)
-#define MCF_MMU_MMUOR_ITLB                   (0x10)
-#define MCF_MMU_MMUOR_CAS                    (0x20)
-#define MCF_MMU_MMUOR_CNL                    (0x40)
-#define MCF_MMU_MMUOR_CA                     (0x80)
-#define MCF_MMU_MMUOR_STLB                   (0x100)
-#define MCF_MMU_MMUOR_AA(x)                  (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_MMU_MMUSR */
-#define MCF_MMU_MMUSR_HIT                    (0x2)
-#define MCF_MMU_MMUSR_WF                     (0x8)
-#define MCF_MMU_MMUSR_RF                     (0x10)
-#define MCF_MMU_MMUSR_SPF                    (0x20)
-
-/* Bit definitions and macros for MCF_MMU_MMUAR */
-#define MCF_MMU_MMUAR_FA(x)                  (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_MMU_MMUTR */
-#define MCF_MMU_MMUTR_V                      (0x1)
-#define MCF_MMU_MMUTR_SG                     (0x2)
-#define MCF_MMU_MMUTR_ID(x)                  (((x)&0xFF)<<0x2)
-#define MCF_MMU_MMUTR_VA(x)                  (((x)&0x3FFFFF)<<0xA)
-
-/* Bit definitions and macros for MCF_MMU_MMUDR */
-#define MCF_MMU_MMUDR_LK                     (0x2)
-#define MCF_MMU_MMUDR_X                      (0x4)
-#define MCF_MMU_MMUDR_W                      (0x8)
-#define MCF_MMU_MMUDR_R                      (0x10)
-#define MCF_MMU_MMUDR_SP                     (0x20)
-#define MCF_MMU_MMUDR_CM(x)                  (((x)&0x3)<<0x6)
-#define MCF_MMU_MMUDR_SZ(x)                  (((x)&0x3)<<0x8)
-#define MCF_MMU_MMUDR_PA(x)                  (((x)&0x3FFFFF)<<0xA)
-
-
-#endif /* __MCF5475_MMU_H__ */
--- a/tos/jtagwait/include/MCF5475_PAD.h
+++ b/tos/jtagwait/include/MCF5475_PAD.h
@@ -1,233 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_PAD_H__
-#define __MCF5475_PAD_H__
-
-
-/*********************************************************************
-*
-* Common GPIO
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_PAD_PAR_FBCTL                    (*(volatile uint16_t*)(&_MBAR[0xA40]))
-#define MCF_PAD_PAR_FBCS                     (*(volatile uint8_t *)(&_MBAR[0xA42]))
-#define MCF_PAD_PAR_DMA                      (*(volatile uint8_t *)(&_MBAR[0xA43]))
-#define MCF_PAD_PAR_FECI2CIRQ                (*(volatile uint16_t*)(&_MBAR[0xA44]))
-#define MCF_PAD_PAR_PCIBG                    (*(volatile uint16_t*)(&_MBAR[0xA48]))
-#define MCF_PAD_PAR_PCIBR                    (*(volatile uint16_t*)(&_MBAR[0xA4A]))
-#define MCF_PAD_PAR_PSC3                     (*(volatile uint8_t *)(&_MBAR[0xA4C]))
-#define MCF_PAD_PAR_PSC2                     (*(volatile uint8_t *)(&_MBAR[0xA4D]))
-#define MCF_PAD_PAR_PSC1                     (*(volatile uint8_t *)(&_MBAR[0xA4E]))
-#define MCF_PAD_PAR_PSC0                     (*(volatile uint8_t *)(&_MBAR[0xA4F]))
-#define MCF_PAD_PAR_DSPI                     (*(volatile uint16_t*)(&_MBAR[0xA50]))
-#define MCF_PAD_PAR_TIMER                    (*(volatile uint8_t *)(&_MBAR[0xA52]))
-
-
-/* Bit definitions and macros for MCF_PAD_PAR_FBCTL */
-#define MCF_PAD_PAR_FBCTL_PAR_ALE(x)         (((x)&0x3)<<0)
-#define MCF_PAD_PAR_FBCTL_PAR_ALE_GPIO       (0)
-#define MCF_PAD_PAR_FBCTL_PAR_ALE_TBST       (0x2)
-#define MCF_PAD_PAR_FBCTL_PAR_ALE_ALE        (0x3)
-#define MCF_PAD_PAR_FBCTL_PAR_TA             (0x4)
-#define MCF_PAD_PAR_FBCTL_PAR_RWB(x)         (((x)&0x3)<<0x4)
-#define MCF_PAD_PAR_FBCTL_PAR_RWB_GPIO       (0)
-#define MCF_PAD_PAR_FBCTL_PAR_RWB_TBST       (0x20)
-#define MCF_PAD_PAR_FBCTL_PAR_RWB_RW         (0x30)
-#define MCF_PAD_PAR_FBCTL_PAR_OE             (0x40)
-#define MCF_PAD_PAR_FBCTL_PAR_BWE0           (0x100)
-#define MCF_PAD_PAR_FBCTL_PAR_BWE1           (0x400)
-#define MCF_PAD_PAR_FBCTL_PAR_BWE2           (0x1000)
-#define MCF_PAD_PAR_FBCTL_PAR_BWE3           (0x4000)
-
-/* Bit definitions and macros for MCF_PAD_PAR_FBCS */
-#define MCF_PAD_PAR_FBCS_PAR_CS1             (0x2)
-#define MCF_PAD_PAR_FBCS_PAR_CS2             (0x4)
-#define MCF_PAD_PAR_FBCS_PAR_CS3             (0x8)
-#define MCF_PAD_PAR_FBCS_PAR_CS4             (0x10)
-#define MCF_PAD_PAR_FBCS_PAR_CS5             (0x20)
-
-/* Bit definitions and macros for MCF_PAD_PAR_DMA */
-#define MCF_PAD_PAR_DMA_PAR_DREQ0(x)         (((x)&0x3)<<0)
-#define MCF_PAD_PAR_DMA_PAR_DREQ0_GPIO       (0)
-#define MCF_PAD_PAR_DMA_PAR_DREQ0_TIN0       (0x2)
-#define MCF_PAD_PAR_DMA_PAR_DREQ0_DREQ0      (0x3)
-#define MCF_PAD_PAR_DMA_PAR_DREQ1(x)         (((x)&0x3)<<0x2)
-#define MCF_PAD_PAR_DMA_PAR_DREQ1_GPIO       (0)
-#define MCF_PAD_PAR_DMA_PAR_DREQ1_IRQ1       (0x4)
-#define MCF_PAD_PAR_DMA_PAR_DREQ1_TIN1       (0x8)
-#define MCF_PAD_PAR_DMA_PAR_DREQ1_DREQ1      (0xC)
-#define MCF_PAD_PAR_DMA_PAR_DACK0(x)         (((x)&0x3)<<0x4)
-#define MCF_PAD_PAR_DMA_PAR_DACK0_GPIO       (0)
-#define MCF_PAD_PAR_DMA_PAR_DACK0_TOUT0      (0x20)
-#define MCF_PAD_PAR_DMA_PAR_DACK0_DACK0      (0x30)
-#define MCF_PAD_PAR_DMA_PAR_DACK1(x)         (((x)&0x3)<<0x6)
-#define MCF_PAD_PAR_DMA_PAR_DACK1_GPIO       (0)
-#define MCF_PAD_PAR_DMA_PAR_DACK1_TOUT1      (0x80)
-#define MCF_PAD_PAR_DMA_PAR_DACK1_DACK1      (0xC0)
-
-/* Bit definitions and macros for MCF_PAD_PAR_FECI2CIRQ */
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_IRQ5       (0x1)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_IRQ6       (0x2)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_SCL        (0x4)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_SDA        (0x8)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E1MDC(x)   (((x)&0x3)<<0x6)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E1MDC_SCL  (0x80)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E1MDC_E1MDC (0xC0)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E1MDIO(x)  (((x)&0x3)<<0x8)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E1MDIO_SDA (0x200)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E1MDIO_E1MDIO (0x300)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E1MII      (0x400)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E17        (0x800)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E0MDC      (0x1000)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E0MDIO     (0x2000)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E0MII      (0x4000)
-#define MCF_PAD_PAR_FECI2CIRQ_PAR_E07        (0x8000)
-
-/* Bit definitions and macros for MCF_PAD_PAR_PCIBG */
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG0(x)      (((x)&0x3)<<0)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG0_GPIO    (0)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG0_TOUT0   (0x2)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG0_PCIBG0  (0x3)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG1(x)      (((x)&0x3)<<0x2)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG1_GPIO    (0)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG1_TOUT1   (0x8)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG1_PCIBG1  (0xC)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG2(x)      (((x)&0x3)<<0x4)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG2_GPIO    (0)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG2_TOUT2   (0x20)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG2_PCIBG2  (0x30)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG3(x)      (((x)&0x3)<<0x6)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG3_GPIO    (0)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG3_TOUT3   (0x80)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG3_PCIBG3  (0xC0)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG4(x)      (((x)&0x3)<<0x8)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG4_GPIO    (0)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG4_TBST    (0x200)
-#define MCF_PAD_PAR_PCIBG_PAR_PCIBG4_PCIBG4  (0x300)
-
-/* Bit definitions and macros for MCF_PAD_PAR_PCIBR */
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR0(x)      (((x)&0x3)<<0)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR0_GPIO    (0)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR0_TIN0    (0x2)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR0_PCIBR0  (0x3)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR1(x)      (((x)&0x3)<<0x2)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR1_GPIO    (0)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR1_TIN1    (0x8)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR1_PCIBR1  (0xC)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR2(x)      (((x)&0x3)<<0x4)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR2_GPIO    (0)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR2_TIN2    (0x20)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR2_PCIBR2  (0x30)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR3(x)      (((x)&0x3)<<0x6)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR3_GPIO    (0)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR3_TIN3    (0x80)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR3_PCIBR3  (0xC0)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR4(x)      (((x)&0x3)<<0x8)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR4_GPIO    (0)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR4_IRQ4    (0x200)
-#define MCF_PAD_PAR_PCIBR_PAR_PCIBR4_PCIBR4  (0x300)
-
-/* Bit definitions and macros for MCF_PAD_PAR_PSC3 */
-#define MCF_PAD_PAR_PSC3_PAR_TXD3            (0x4)
-#define MCF_PAD_PAR_PSC3_PAR_RXD3            (0x8)
-#define MCF_PAD_PAR_PSC3_PAR_RTS3(x)         (((x)&0x3)<<0x4)
-#define MCF_PAD_PAR_PSC3_PAR_RTS3_GPIO       (0)
-#define MCF_PAD_PAR_PSC3_PAR_RTS3_FSYNC      (0x20)
-#define MCF_PAD_PAR_PSC3_PAR_RTS3_RTS        (0x30)
-#define MCF_PAD_PAR_PSC3_PAR_CTS3(x)         (((x)&0x3)<<0x6)
-#define MCF_PAD_PAR_PSC3_PAR_CTS3_GPIO       (0)
-#define MCF_PAD_PAR_PSC3_PAR_CTS3_BCLK       (0x80)
-#define MCF_PAD_PAR_PSC3_PAR_CTS3_CTS        (0xC0)
-
-/* Bit definitions and macros for MCF_PAD_PAR_PSC2 */
-#define MCF_PAD_PAR_PSC2_PAR_TXD2            (0x4)
-#define MCF_PAD_PAR_PSC2_PAR_RXD2            (0x8)
-#define MCF_PAD_PAR_PSC2_PAR_RTS2(x)         (((x)&0x3)<<0x4)
-#define MCF_PAD_PAR_PSC2_PAR_RTS2_GPIO       (0)
-#define MCF_PAD_PAR_PSC2_PAR_RTS2_FSYNC      (0x20)
-#define MCF_PAD_PAR_PSC2_PAR_RTS2_RTS        (0x30)
-#define MCF_PAD_PAR_PSC2_PAR_CTS2(x)         (((x)&0x3)<<0x6)
-#define MCF_PAD_PAR_PSC2_PAR_CTS2_GPIO       (0)
-#define MCF_PAD_PAR_PSC2_PAR_CTS2_BCLK       (0x80)
-#define MCF_PAD_PAR_PSC2_PAR_CTS2_CTS        (0xC0)
-
-/* Bit definitions and macros for MCF_PAD_PAR_PSC1 */
-#define MCF_PAD_PAR_PSC1_PAR_TXD1            (0x4)
-#define MCF_PAD_PAR_PSC1_PAR_RXD1            (0x8)
-#define MCF_PAD_PAR_PSC1_PAR_RTS1(x)         (((x)&0x3)<<0x4)
-#define MCF_PAD_PAR_PSC1_PAR_RTS1_GPIO       (0)
-#define MCF_PAD_PAR_PSC1_PAR_RTS1_FSYNC      (0x20)
-#define MCF_PAD_PAR_PSC1_PAR_RTS1_RTS        (0x30)
-#define MCF_PAD_PAR_PSC1_PAR_CTS1(x)         (((x)&0x3)<<0x6)
-#define MCF_PAD_PAR_PSC1_PAR_CTS1_GPIO       (0)
-#define MCF_PAD_PAR_PSC1_PAR_CTS1_BCLK       (0x80)
-#define MCF_PAD_PAR_PSC1_PAR_CTS1_CTS        (0xC0)
-
-/* Bit definitions and macros for MCF_PAD_PAR_PSC0 */
-#define MCF_PAD_PAR_PSC0_PAR_TXD0            (0x4)
-#define MCF_PAD_PAR_PSC0_PAR_RXD0            (0x8)
-#define MCF_PAD_PAR_PSC0_PAR_RTS0(x)         (((x)&0x3)<<0x4)
-#define MCF_PAD_PAR_PSC0_PAR_RTS0_GPIO       (0)
-#define MCF_PAD_PAR_PSC0_PAR_RTS0_FSYNC      (0x20)
-#define MCF_PAD_PAR_PSC0_PAR_RTS0_RTS        (0x30)
-#define MCF_PAD_PAR_PSC0_PAR_CTS0(x)         (((x)&0x3)<<0x6)
-#define MCF_PAD_PAR_PSC0_PAR_CTS0_GPIO       (0)
-#define MCF_PAD_PAR_PSC0_PAR_CTS0_BCLK       (0x80)
-#define MCF_PAD_PAR_PSC0_PAR_CTS0_CTS        (0xC0)
-
-/* Bit definitions and macros for MCF_PAD_PAR_DSPI */
-#define MCF_PAD_PAR_DSPI_PAR_SOUT(x)         (((x)&0x3)<<0)
-#define MCF_PAD_PAR_DSPI_PAR_SOUT_GPIO       (0)
-#define MCF_PAD_PAR_DSPI_PAR_SOUT_TXD        (0x2)
-#define MCF_PAD_PAR_DSPI_PAR_SOUT_SOUT       (0x3)
-#define MCF_PAD_PAR_DSPI_PAR_SIN(x)          (((x)&0x3)<<0x2)
-#define MCF_PAD_PAR_DSPI_PAR_SIN_GPIO        (0)
-#define MCF_PAD_PAR_DSPI_PAR_SIN_RXD         (0x8)
-#define MCF_PAD_PAR_DSPI_PAR_SIN_SIN         (0xC)
-#define MCF_PAD_PAR_DSPI_PAR_SCK(x)          (((x)&0x3)<<0x4)
-#define MCF_PAD_PAR_DSPI_PAR_SCK_GPIO        (0)
-#define MCF_PAD_PAR_DSPI_PAR_SCK_BCLK        (0x10)
-#define MCF_PAD_PAR_DSPI_PAR_SCK_CTS         (0x20)
-#define MCF_PAD_PAR_DSPI_PAR_SCK_SCK         (0x30)
-#define MCF_PAD_PAR_DSPI_PAR_CS0(x)          (((x)&0x3)<<0x6)
-#define MCF_PAD_PAR_DSPI_PAR_CS0_GPIO        (0)
-#define MCF_PAD_PAR_DSPI_PAR_CS0_FSYNC       (0x40)
-#define MCF_PAD_PAR_DSPI_PAR_CS0_RTS         (0x80)
-#define MCF_PAD_PAR_DSPI_PAR_CS0_DSPICS0     (0xC0)
-#define MCF_PAD_PAR_DSPI_PAR_CS2(x)          (((x)&0x3)<<0x8)
-#define MCF_PAD_PAR_DSPI_PAR_CS2_GPIO        (0)
-#define MCF_PAD_PAR_DSPI_PAR_CS2_TOUT2       (0x200)
-#define MCF_PAD_PAR_DSPI_PAR_CS2_DSPICS2     (0x300)
-#define MCF_PAD_PAR_DSPI_PAR_CS3(x)          (((x)&0x3)<<0xA)
-#define MCF_PAD_PAR_DSPI_PAR_CS3_GPIO        (0)
-#define MCF_PAD_PAR_DSPI_PAR_CS3_TOUT3       (0x800)
-#define MCF_PAD_PAR_DSPI_PAR_CS3_DSPICS3     (0xC00)
-#define MCF_PAD_PAR_DSPI_PAR_CS5             (0x1000)
-
-/* Bit definitions and macros for MCF_PAD_PAR_TIMER */
-#define MCF_PAD_PAR_TIMER_PAR_TOUT2          (0x1)
-#define MCF_PAD_PAR_TIMER_PAR_TIN2(x)        (((x)&0x3)<<0x1)
-#define MCF_PAD_PAR_TIMER_PAR_TIN2_IRQ2      (0x4)
-#define MCF_PAD_PAR_TIMER_PAR_TIN2_TIN2      (0x6)
-#define MCF_PAD_PAR_TIMER_PAR_TOUT3          (0x8)
-#define MCF_PAD_PAR_TIMER_PAR_TIN3(x)        (((x)&0x3)<<0x4)
-#define MCF_PAD_PAR_TIMER_PAR_TIN3_IRQ3      (0x20)
-#define MCF_PAD_PAR_TIMER_PAR_TIN3_TIN3      (0x30)
-
-
-#endif /* __MCF5475_PAD_H__ */
--- a/tos/jtagwait/include/MCF5475_PCI.h
+++ b/tos/jtagwait/include/MCF5475_PCI.h
@@ -1,376 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_PCI_H__
-#define __MCF5475_PCI_H__
-
-
-/*********************************************************************
-*
-* PCI Bus Controller (PCI)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_PCI_PCIIDR                       (*(volatile uint32_t*)(&_MBAR[0xB00]))
-#define MCF_PCI_PCISCR                       (*(volatile uint32_t*)(&_MBAR[0xB04]))
-#define MCF_PCI_PCICCRIR                     (*(volatile uint32_t*)(&_MBAR[0xB08]))
-#define MCF_PCI_PCICR1                       (*(volatile uint32_t*)(&_MBAR[0xB0C]))
-#define MCF_PCI_PCIBAR0                      (*(volatile uint32_t*)(&_MBAR[0xB10]))
-#define MCF_PCI_PCIBAR1                      (*(volatile uint32_t*)(&_MBAR[0xB14]))
-#define MCF_PCI_PCICCPR                      (*(volatile uint32_t*)(&_MBAR[0xB28]))
-#define MCF_PCI_PCISID                       (*(volatile uint32_t*)(&_MBAR[0xB2C]))
-#define MCF_PCI_PCICR2                       (*(volatile uint32_t*)(&_MBAR[0xB3C]))
-#define MCF_PCI_PCIGSCR                      (*(volatile uint32_t*)(&_MBAR[0xB60]))
-#define MCF_PCI_PCITBATR0                    (*(volatile uint32_t*)(&_MBAR[0xB64]))
-#define MCF_PCI_PCITBATR1                    (*(volatile uint32_t*)(&_MBAR[0xB68]))
-#define MCF_PCI_PCITCR                       (*(volatile uint32_t*)(&_MBAR[0xB6C]))
-#define MCF_PCI_PCIIW0BTAR                   (*(volatile uint32_t*)(&_MBAR[0xB70]))
-#define MCF_PCI_PCIIW1BTAR                   (*(volatile uint32_t*)(&_MBAR[0xB74]))
-#define MCF_PCI_PCIIW2BTAR                   (*(volatile uint32_t*)(&_MBAR[0xB78]))
-#define MCF_PCI_PCIIWCR                      (*(volatile uint32_t*)(&_MBAR[0xB80]))
-#define MCF_PCI_PCIICR                       (*(volatile uint32_t*)(&_MBAR[0xB84]))
-#define MCF_PCI_PCIISR                       (*(volatile uint32_t*)(&_MBAR[0xB88]))
-#define MCF_PCI_PCICAR                       (*(volatile uint32_t*)(&_MBAR[0xBF8]))
-#define MCF_PCI_PCITPSR                      (*(volatile uint32_t*)(&_MBAR[0x8400]))
-#define MCF_PCI_PCITSAR                      (*(volatile uint32_t*)(&_MBAR[0x8404]))
-#define MCF_PCI_PCITTCR                      (*(volatile uint32_t*)(&_MBAR[0x8408]))
-#define MCF_PCI_PCITER                       (*(volatile uint32_t*)(&_MBAR[0x840C]))
-#define MCF_PCI_PCITNAR                      (*(volatile uint32_t*)(&_MBAR[0x8410]))
-#define MCF_PCI_PCITLWR                      (*(volatile uint32_t*)(&_MBAR[0x8414]))
-#define MCF_PCI_PCITDCR                      (*(volatile uint32_t*)(&_MBAR[0x8418]))
-#define MCF_PCI_PCITSR                       (*(volatile uint32_t*)(&_MBAR[0x841C]))
-#define MCF_PCI_PCITFDR                      (*(volatile uint32_t*)(&_MBAR[0x8440]))
-#define MCF_PCI_PCITFSR                      (*(volatile uint32_t*)(&_MBAR[0x8444]))
-#define MCF_PCI_PCITFCR                      (*(volatile uint32_t*)(&_MBAR[0x8448]))
-#define MCF_PCI_PCITFAR                      (*(volatile uint32_t*)(&_MBAR[0x844C]))
-#define MCF_PCI_PCITFRPR                     (*(volatile uint32_t*)(&_MBAR[0x8450]))
-#define MCF_PCI_PCITFWPR                     (*(volatile uint32_t*)(&_MBAR[0x8454]))
-#define MCF_PCI_PCIRPSR                      (*(volatile uint32_t*)(&_MBAR[0x8480]))
-#define MCF_PCI_PCIRSAR                      (*(volatile uint32_t*)(&_MBAR[0x8484]))
-#define MCF_PCI_PCIRTCR                      (*(volatile uint32_t*)(&_MBAR[0x8488]))
-#define MCF_PCI_PCIRER                       (*(volatile uint32_t*)(&_MBAR[0x848C]))
-#define MCF_PCI_PCIRNAR                      (*(volatile uint32_t*)(&_MBAR[0x8490]))
-#define MCF_PCI_PCIRDCR                      (*(volatile uint32_t*)(&_MBAR[0x8498]))
-#define MCF_PCI_PCIRSR                       (*(volatile uint32_t*)(&_MBAR[0x849C]))
-#define MCF_PCI_PCIRFDR                      (*(volatile uint32_t*)(&_MBAR[0x84C0]))
-#define MCF_PCI_PCIRFSR                      (*(volatile uint32_t*)(&_MBAR[0x84C4]))
-#define MCF_PCI_PCIRFCR                      (*(volatile uint32_t*)(&_MBAR[0x84C8]))
-#define MCF_PCI_PCIRFAR                      (*(volatile uint32_t*)(&_MBAR[0x84CC]))
-#define MCF_PCI_PCIRFRPR                     (*(volatile uint32_t*)(&_MBAR[0x84D0]))
-#define MCF_PCI_PCIRFWPR                     (*(volatile uint32_t*)(&_MBAR[0x84D4]))
-
-
-/* Bit definitions and macros for MCF_PCI_PCIIDR */
-#define MCF_PCI_PCIIDR_VENDORID(x)           (((x)&0xFFFF)<<0)
-#define MCF_PCI_PCIIDR_DEVICEID(x)           (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_PCI_PCISCR */
-#define MCF_PCI_PCISCR_IO                    (0x1)
-#define MCF_PCI_PCISCR_M                     (0x2)
-#define MCF_PCI_PCISCR_B                     (0x4)
-#define MCF_PCI_PCISCR_SP                    (0x8)
-#define MCF_PCI_PCISCR_MW                    (0x10)
-#define MCF_PCI_PCISCR_V                     (0x20)
-#define MCF_PCI_PCISCR_PER                   (0x40)
-#define MCF_PCI_PCISCR_ST                    (0x80)
-#define MCF_PCI_PCISCR_S                     (0x100)
-#define MCF_PCI_PCISCR_F                     (0x200)
-#define MCF_PCI_PCISCR_C                     (0x100000)
-#define MCF_PCI_PCISCR_66M                   (0x200000)
-#define MCF_PCI_PCISCR_R                     (0x400000)
-#define MCF_PCI_PCISCR_FC                    (0x800000)
-#define MCF_PCI_PCISCR_DP                    (0x1000000)
-#define MCF_PCI_PCISCR_DT(x)                 (((x)&0x3)<<0x19)
-#define MCF_PCI_PCISCR_TS                    (0x8000000)
-#define MCF_PCI_PCISCR_TR                    (0x10000000)
-#define MCF_PCI_PCISCR_MA                    (0x20000000)
-#define MCF_PCI_PCISCR_SE                    (0x40000000)
-#define MCF_PCI_PCISCR_PE                    (0x80000000)
-
-/* Bit definitions and macros for MCF_PCI_PCICCRIR */
-#define MCF_PCI_PCICCRIR_REVISIONID(x)       (((x)&0xFF)<<0)
-#define MCF_PCI_PCICCRIR_CLASSCODE(x)        (((x)&0xFFFFFF)<<0x8)
-
-/* Bit definitions and macros for MCF_PCI_PCICR1 */
-#define MCF_PCI_PCICR1_CACHELINESIZE(x)      (((x)&0xFF)<<0)
-#define MCF_PCI_PCICR1_LATTIMER(x)           (((x)&0xFF)<<0x8)
-#define MCF_PCI_PCICR1_HEADERTYPE(x)         (((x)&0xFF)<<0x10)
-#define MCF_PCI_PCICR1_BIST(x)               (((x)&0xFF)<<0x18)
-
-/* Bit definitions and macros for MCF_PCI_PCIBAR0 */
-#define MCF_PCI_PCIBAR0_IOM                  (0x1)
-#define MCF_PCI_PCIBAR0_RANGE(x)             (((x)&0x3)<<0x1)
-#define MCF_PCI_PCIBAR0_PREF                 (0x8)
-#define MCF_PCI_PCIBAR0_BAR0(x)              (((x)&0x3FFF)<<0x12)
-
-/* Bit definitions and macros for MCF_PCI_PCIBAR1 */
-#define MCF_PCI_PCIBAR1_IOM                  (0x1)
-#define MCF_PCI_PCIBAR1_RANGE(x)             (((x)&0x3)<<0x1)
-#define MCF_PCI_PCIBAR1_PREF                 (0x8)
-#define MCF_PCI_PCIBAR1_BAR1(x)              (((x)&0x3)<<0x1E)
-
-/* Bit definitions and macros for MCF_PCI_PCICCPR */
-#define MCF_PCI_PCICCPR_PCICCP(x)            (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCISID */
-#define MCF_PCI_PCISID_VENDORID(x)           (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCICR2 */
-#define MCF_PCI_PCICR2_INTLINE(x)            (((x)&0xFF)<<0)
-#define MCF_PCI_PCICR2_INTPIN(x)             (((x)&0xFF)<<0x8)
-#define MCF_PCI_PCICR2_MINGNT(x)             (((x)&0xFF)<<0x10)
-#define MCF_PCI_PCICR2_MAXLAT(x)             (((x)&0xFF)<<0x18)
-
-/* Bit definitions and macros for MCF_PCI_PCIGSCR */
-#define MCF_PCI_PCIGSCR_PR                   (0x1)
-#define MCF_PCI_PCIGSCR_SEE                  (0x1000)
-#define MCF_PCI_PCIGSCR_PEE                  (0x2000)
-#define MCF_PCI_PCIGSCR_CLKINRESERVED(x)     (((x)&0x7)<<0x10)
-#define MCF_PCI_PCIGSCR_XLB2CLKIN(x)         (((x)&0x7)<<0x18)
-#define MCF_PCI_PCIGSCR_SE                   (0x10000000)
-#define MCF_PCI_PCIGSCR_PE                   (0x20000000)
-
-/* Bit definitions and macros for MCF_PCI_PCITBATR0 */
-#define MCF_PCI_PCITBATR0_EN                 (0x1)
-#define MCF_PCI_PCITBATR0_BAT0(x)            (((x)&0x3FFF)<<0x12)
-
-/* Bit definitions and macros for MCF_PCI_PCITBATR1 */
-#define MCF_PCI_PCITBATR1_EN                 (0x1)
-#define MCF_PCI_PCITBATR1_BAT1(x)            (((x)&0x3)<<0x1E)
-
-/* Bit definitions and macros for MCF_PCI_PCITCR */
-#define MCF_PCI_PCITCR_P                     (0x10000)
-#define MCF_PCI_PCITCR_LD                    (0x1000000)
-
-/* Bit definitions and macros for MCF_PCI_PCIIW0BTAR */
-#define MCF_PCI_PCIIW0BTAR_WTA0(x)           (((x)&0xFF)<<0x8)
-#define MCF_PCI_PCIIW0BTAR_WAM0(x)           (((x)&0xFF)<<0x10)
-#define MCF_PCI_PCIIW0BTAR_WBA0(x)           (((x)&0xFF)<<0x18)
-
-/* Bit definitions and macros for MCF_PCI_PCIIW1BTAR */
-#define MCF_PCI_PCIIW1BTAR_WTA1(x)           (((x)&0xFF)<<0x8)
-#define MCF_PCI_PCIIW1BTAR_WAM1(x)           (((x)&0xFF)<<0x10)
-#define MCF_PCI_PCIIW1BTAR_WBA1(x)           (((x)&0xFF)<<0x18)
-
-/* Bit definitions and macros for MCF_PCI_PCIIW2BTAR */
-#define MCF_PCI_PCIIW2BTAR_WTA2(x)           (((x)&0xFF)<<0x8)
-#define MCF_PCI_PCIIW2BTAR_WAM2(x)           (((x)&0xFF)<<0x10)
-#define MCF_PCI_PCIIW2BTAR_WBA2(x)           (((x)&0xFF)<<0x18)
-
-/* Bit definitions and macros for MCF_PCI_PCIIWCR */
-#define MCF_PCI_PCIIWCR_WINCTRL2_E           (0x100)
-#define MCF_PCI_PCIIWCR_WINCTRL2_PRC(x)      (((x)&0x3)<<0x9)
-#define MCF_PCI_PCIIWCR_WINCTRL2_IOM         (0x800)
-#define MCF_PCI_PCIIWCR_WINCTRL1_E           (0x10000)
-#define MCF_PCI_PCIIWCR_WINCTRL1_PRC(x)      (((x)&0x3)<<0x11)
-#define MCF_PCI_PCIIWCR_WINCTRL1_IOM         (0x80000)
-#define MCF_PCI_PCIIWCR_WINCTRL0_E           (0x1000000)
-#define MCF_PCI_PCIIWCR_WINCTRL0_PRC(x)      (((x)&0x3)<<0x19)
-#define MCF_PCI_PCIIWCR_WINCTRL0_IOM         (0x8000000)
-#define MCF_PCI_PCIIWCR_WINCTRL2_MEMREAD     (0x100)
-#define MCF_PCI_PCIIWCR_WINCTRL2_MEMRDLINE   (0x300)
-#define MCF_PCI_PCIIWCR_WINCTRL2_MEMRDMUL    (0x500)
-#define MCF_PCI_PCIIWCR_WINCTRL2_IO          (0x900)
-#define MCF_PCI_PCIIWCR_WINCTRL1_MEMREAD     (0x10000)
-#define MCF_PCI_PCIIWCR_WINCTRL1_MEMRDLINE   (0x30000)
-#define MCF_PCI_PCIIWCR_WINCTRL1_MEMRDMUL    (0x50000)
-#define MCF_PCI_PCIIWCR_WINCTRL1_IO          (0x90000)
-#define MCF_PCI_PCIIWCR_WINCTRL0_MEMREAD     (0x1000000)
-#define MCF_PCI_PCIIWCR_WINCTRL0_MEMRDLINE   (0x3000000)
-#define MCF_PCI_PCIIWCR_WINCTRL0_MEMRDMUL    (0x5000000)
-#define MCF_PCI_PCIIWCR_WINCTRL0_IO          (0x9000000)
-
-/* Bit definitions and macros for MCF_PCI_PCIICR */
-#define MCF_PCI_PCIICR_MAXRETRY(x)           (((x)&0xFF)<<0)
-#define MCF_PCI_PCIICR_TAE                   (0x1000000)
-#define MCF_PCI_PCIICR_IAE                   (0x2000000)
-#define MCF_PCI_PCIICR_REE                   (0x4000000)
-
-/* Bit definitions and macros for MCF_PCI_PCIISR */
-#define MCF_PCI_PCIISR_TA                    (0x1000000)
-#define MCF_PCI_PCIISR_IA                    (0x2000000)
-#define MCF_PCI_PCIISR_RE                    (0x4000000)
-
-/* Bit definitions and macros for MCF_PCI_PCICAR */
-#define MCF_PCI_PCICAR_DWORD(x)              (((x)&0x3F)<<0x2)
-#define MCF_PCI_PCICAR_FUNCNUM(x)            (((x)&0x7)<<0x8)
-#define MCF_PCI_PCICAR_DEVNUM(x)             (((x)&0x1F)<<0xB)
-#define MCF_PCI_PCICAR_BUSNUM(x)             (((x)&0xFF)<<0x10)
-#define MCF_PCI_PCICAR_E                     (0x80000000)
-
-/* Bit definitions and macros for MCF_PCI_PCITPSR */
-#define MCF_PCI_PCITPSR_PKTSIZE(x)           (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_PCI_PCITSAR */
-#define MCF_PCI_PCITSAR_STARTADD(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCITTCR */
-#define MCF_PCI_PCITTCR_DI                   (0x1)
-#define MCF_PCI_PCITTCR_W                    (0x10)
-#define MCF_PCI_PCITTCR_MAXBEATS(x)          (((x)&0x7)<<0x8)
-#define MCF_PCI_PCITTCR_MAXRETRY(x)          (((x)&0xFF)<<0x10)
-#define MCF_PCI_PCITTCR_PCICMD(x)            (((x)&0xF)<<0x18)
-
-/* Bit definitions and macros for MCF_PCI_PCITER */
-#define MCF_PCI_PCITER_NE                    (0x10000)
-#define MCF_PCI_PCITER_IAE                   (0x20000)
-#define MCF_PCI_PCITER_TAE                   (0x40000)
-#define MCF_PCI_PCITER_RE                    (0x80000)
-#define MCF_PCI_PCITER_SE                    (0x100000)
-#define MCF_PCI_PCITER_FEE                   (0x200000)
-#define MCF_PCI_PCITER_ME                    (0x1000000)
-#define MCF_PCI_PCITER_BE                    (0x8000000)
-#define MCF_PCI_PCITER_CM                    (0x10000000)
-#define MCF_PCI_PCITER_RF                    (0x40000000)
-#define MCF_PCI_PCITER_RC                    (0x80000000)
-
-/* Bit definitions and macros for MCF_PCI_PCITNAR */
-#define MCF_PCI_PCITNAR_NEXTADDRESS(x)       (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCITLWR */
-#define MCF_PCI_PCITLWR_LASTWORD(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCITDCR */
-#define MCF_PCI_PCITDCR_PKTSDONE(x)          (((x)&0xFFFF)<<0)
-#define MCF_PCI_PCITDCR_BYTESDONE(x)         (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_PCI_PCITSR */
-#define MCF_PCI_PCITSR_IA                    (0x10000)
-#define MCF_PCI_PCITSR_TA                    (0x20000)
-#define MCF_PCI_PCITSR_RE                    (0x40000)
-#define MCF_PCI_PCITSR_SE                    (0x80000)
-#define MCF_PCI_PCITSR_FE                    (0x100000)
-#define MCF_PCI_PCITSR_BE1                   (0x200000)
-#define MCF_PCI_PCITSR_BE2                   (0x400000)
-#define MCF_PCI_PCITSR_BE3                   (0x800000)
-#define MCF_PCI_PCITSR_NT                    (0x1000000)
-
-/* Bit definitions and macros for MCF_PCI_PCITFDR */
-#define MCF_PCI_PCITFDR_FIFODATAWORD(x)      (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCITFSR */
-#define MCF_PCI_PCITFSR_EMPTY                (0x10000)
-#define MCF_PCI_PCITFSR_ALARM                (0x20000)
-#define MCF_PCI_PCITFSR_FULL                 (0x40000)
-#define MCF_PCI_PCITFSR_FR                   (0x80000)
-#define MCF_PCI_PCITFSR_OF                   (0x100000)
-#define MCF_PCI_PCITFSR_UF                   (0x200000)
-#define MCF_PCI_PCITFSR_RXW                  (0x400000)
-#define MCF_PCI_PCITFSR_FAE                  (0x800000)
-#define MCF_PCI_PCITFSR_TXW                  (0x40000000)
-#define MCF_PCI_PCITFSR_IP                   (0x80000000)
-
-/* Bit definitions and macros for MCF_PCI_PCITFCR */
-#define MCF_PCI_PCITFCR_TXW_MASK             (0x40000)
-#define MCF_PCI_PCITFCR_OF_MASK              (0x80000)
-#define MCF_PCI_PCITFCR_UF_MASK              (0x100000)
-#define MCF_PCI_PCITFCR_RXW_MASK             (0x200000)
-#define MCF_PCI_PCITFCR_FAE_MASK             (0x400000)
-#define MCF_PCI_PCITFCR_IP_MASK              (0x800000)
-#define MCF_PCI_PCITFCR_GR(x)                (((x)&0x7)<<0x18)
-#define MCF_PCI_PCITFCR_WFR                  (0x20000000)
-
-/* Bit definitions and macros for MCF_PCI_PCITFAR */
-#define MCF_PCI_PCITFAR_ALARM(x)             (((x)&0xFFF)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCITFRPR */
-#define MCF_PCI_PCITFRPR_READPTR(x)          (((x)&0x7F)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCITFWPR */
-#define MCF_PCI_PCITFWPR_WRITEPTR(x)         (((x)&0x7F)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCIRPSR */
-#define MCF_PCI_PCIRPSR_PKTSIZE(x)           (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_PCI_PCIRSAR */
-#define MCF_PCI_PCIRSAR_STARTADD(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCIRTCR */
-#define MCF_PCI_PCIRTCR_DI                   (0x1)
-#define MCF_PCI_PCIRTCR_W                    (0x10)
-#define MCF_PCI_PCIRTCR_MAXBEATS(x)          (((x)&0x7)<<0x8)
-#define MCF_PCI_PCIRTCR_FB                   (0x1000)
-#define MCF_PCI_PCIRTCR_MAXRETRY(x)          (((x)&0xFF)<<0x10)
-#define MCF_PCI_PCIRTCR_PCICMD(x)            (((x)&0xF)<<0x18)
-
-/* Bit definitions and macros for MCF_PCI_PCIRER */
-#define MCF_PCI_PCIRER_NE                    (0x10000)
-#define MCF_PCI_PCIRER_IAE                   (0x20000)
-#define MCF_PCI_PCIRER_TAE                   (0x40000)
-#define MCF_PCI_PCIRER_RE                    (0x80000)
-#define MCF_PCI_PCIRER_SE                    (0x100000)
-#define MCF_PCI_PCIRER_FEE                   (0x200000)
-#define MCF_PCI_PCIRER_ME                    (0x1000000)
-#define MCF_PCI_PCIRER_BE                    (0x8000000)
-#define MCF_PCI_PCIRER_CM                    (0x10000000)
-#define MCF_PCI_PCIRER_FE                    (0x20000000)
-#define MCF_PCI_PCIRER_RF                    (0x40000000)
-#define MCF_PCI_PCIRER_RC                    (0x80000000)
-
-/* Bit definitions and macros for MCF_PCI_PCIRNAR */
-#define MCF_PCI_PCIRNAR_NEXTADDRESS(x)       (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCIRDCR */
-#define MCF_PCI_PCIRDCR_PKTSDONE(x)          (((x)&0xFFFF)<<0)
-#define MCF_PCI_PCIRDCR_BYTESDONE(x)         (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_PCI_PCIRSR */
-#define MCF_PCI_PCIRSR_IA                    (0x10000)
-#define MCF_PCI_PCIRSR_TA                    (0x20000)
-#define MCF_PCI_PCIRSR_RE                    (0x40000)
-#define MCF_PCI_PCIRSR_SE                    (0x80000)
-#define MCF_PCI_PCIRSR_FE                    (0x100000)
-#define MCF_PCI_PCIRSR_BE1                   (0x200000)
-#define MCF_PCI_PCIRSR_BE2                   (0x400000)
-#define MCF_PCI_PCIRSR_BE3                   (0x800000)
-#define MCF_PCI_PCIRSR_NT                    (0x1000000)
-
-/* Bit definitions and macros for MCF_PCI_PCIRFDR */
-#define MCF_PCI_PCIRFDR_FIFODATAWORD(x)      (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCIRFSR */
-#define MCF_PCI_PCIRFSR_EMPTY                (0x10000)
-#define MCF_PCI_PCIRFSR_ALARM                (0x20000)
-#define MCF_PCI_PCIRFSR_FULL                 (0x40000)
-#define MCF_PCI_PCIRFSR_FR                   (0x80000)
-#define MCF_PCI_PCIRFSR_OF                   (0x100000)
-#define MCF_PCI_PCIRFSR_UF                   (0x200000)
-#define MCF_PCI_PCIRFSR_RXW                  (0x400000)
-#define MCF_PCI_PCIRFSR_FAE                  (0x800000)
-#define MCF_PCI_PCIRFSR_TXW                  (0x40000000)
-#define MCF_PCI_PCIRFSR_IP                   (0x80000000)
-
-/* Bit definitions and macros for MCF_PCI_PCIRFCR */
-#define MCF_PCI_PCIRFCR_TXW_MASK             (0x40000)
-#define MCF_PCI_PCIRFCR_OF_MASK              (0x80000)
-#define MCF_PCI_PCIRFCR_UF_MASK              (0x100000)
-#define MCF_PCI_PCIRFCR_RXW_MASK             (0x200000)
-#define MCF_PCI_PCIRFCR_FAE_MASK             (0x400000)
-#define MCF_PCI_PCIRFCR_IP_MASK              (0x800000)
-#define MCF_PCI_PCIRFCR_GR(x)                (((x)&0x7)<<0x18)
-#define MCF_PCI_PCIRFCR_WFR                  (0x20000000)
-
-/* Bit definitions and macros for MCF_PCI_PCIRFAR */
-#define MCF_PCI_PCIRFAR_ALARM(x)             (((x)&0x7F)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCIRFRPR */
-#define MCF_PCI_PCIRFRPR_READPTR(x)          (((x)&0x7F)<<0)
-
-/* Bit definitions and macros for MCF_PCI_PCIRFWPR */
-#define MCF_PCI_PCIRFWPR_WRITEPTR(x)         (((x)&0x7F)<<0)
-
-
-#endif /* __MCF5475_PCI_H__ */
--- a/tos/jtagwait/include/MCF5475_PCIARB.h
+++ b/tos/jtagwait/include/MCF5475_PCIARB.h
@@ -1,43 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_PCIARB_H__
-#define __MCF5475_PCIARB_H__
-
-
-/*********************************************************************
-*
-* PCI Bus Arbiter Module (PCIARB)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_PCIARB_PACR                      (*(volatile uint32_t*)(&_MBAR[0xC00]))
-#define MCF_PCIARB_PASR                      (*(volatile uint32_t*)(&_MBAR[0xC04]))
-
-
-/* Bit definitions and macros for MCF_PCIARB_PACR */
-#define MCF_PCIARB_PACR_INTMPRI              (0x1)
-#define MCF_PCIARB_PACR_EXTMPRI(x)           (((x)&0x1F)<<0x1)
-#define MCF_PCIARB_PACR_INTMINTEN            (0x10000)
-#define MCF_PCIARB_PACR_EXTMINTEN(x)         (((x)&0x1F)<<0x11)
-#define MCF_PCIARB_PACR_DS                   (0x80000000)
-
-/* Bit definitions and macros for MCF_PCIARB_PASR */
-#define MCF_PCIARB_PASR_ITLMBK               (0x10000)
-#define MCF_PCIARB_PASR_EXTMBK(x)            (((x)&0x1F)<<0x11)
-
-
-#endif /* __MCF5475_PCIARB_H__ */
--- a/tos/jtagwait/include/MCF5475_PSC.h
+++ b/tos/jtagwait/include/MCF5475_PSC.h
@@ -1,527 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_PSC_H__
-#define __MCF5475_PSC_H__
-
-
-/*********************************************************************
-*
-* Programmable Serial Controller (PSC)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_PSC0_PSCMR2                      (*(volatile uint8_t *)(&_MBAR[0x8600]))
-#define MCF_PSC0_PSCMR1                      (*(volatile uint8_t *)(&_MBAR[0x8600]))
-#define MCF_PSC0_PSCCSR                      (*(volatile uint8_t *)(&_MBAR[0x8604]))
-#define MCF_PSC0_PSCSR                       (*(volatile uint16_t*)(&_MBAR[0x8604]))
-#define MCF_PSC0_PSCCR                       (*(volatile uint8_t *)(&_MBAR[0x8608]))
-#define MCF_PSC0_PSCRB_8BIT                  (*(volatile uint32_t*)(&_MBAR[0x860C]))
-#define MCF_PSC0_PSCTB_8BIT                  (*(volatile uint32_t*)(&_MBAR[0x860C]))
-#define MCF_PSC0_PSCRB_16BIT                 (*(volatile uint32_t*)(&_MBAR[0x860C]))
-#define MCF_PSC0_PSCTB_16BIT                 (*(volatile uint32_t*)(&_MBAR[0x860C]))
-#define MCF_PSC0_PSCRB_AC97                  (*(volatile uint32_t*)(&_MBAR[0x860C]))
-#define MCF_PSC0_PSCTB_AC97                  (*(volatile uint32_t*)(&_MBAR[0x860C]))
-#define MCF_PSC0_PSCIPCR                     (*(volatile uint8_t *)(&_MBAR[0x8610]))
-#define MCF_PSC0_PSCACR                      (*(volatile uint8_t *)(&_MBAR[0x8610]))
-#define MCF_PSC0_PSCIMR                      (*(volatile uint16_t*)(&_MBAR[0x8614]))
-#define MCF_PSC0_PSCISR                      (*(volatile uint16_t*)(&_MBAR[0x8614]))
-#define MCF_PSC0_PSCCTUR                     (*(volatile uint8_t *)(&_MBAR[0x8618]))
-#define MCF_PSC0_PSCCTLR                     (*(volatile uint8_t *)(&_MBAR[0x861C]))
-#define MCF_PSC0_PSCIP                       (*(volatile uint8_t *)(&_MBAR[0x8634]))
-#define MCF_PSC0_PSCOPSET                    (*(volatile uint8_t *)(&_MBAR[0x8638]))
-#define MCF_PSC0_PSCOPRESET                  (*(volatile uint8_t *)(&_MBAR[0x863C]))
-#define MCF_PSC0_PSCSICR                     (*(volatile uint8_t *)(&_MBAR[0x8640]))
-#define MCF_PSC0_PSCIRCR1                    (*(volatile uint8_t *)(&_MBAR[0x8644]))
-#define MCF_PSC0_PSCIRCR2                    (*(volatile uint8_t *)(&_MBAR[0x8648]))
-#define MCF_PSC0_PSCIRSDR                    (*(volatile uint8_t *)(&_MBAR[0x864C]))
-#define MCF_PSC0_PSCIRMDR                    (*(volatile uint8_t *)(&_MBAR[0x8650]))
-#define MCF_PSC0_PSCIRFDR                    (*(volatile uint8_t *)(&_MBAR[0x8654]))
-#define MCF_PSC0_PSCRFCNT                    (*(volatile uint16_t*)(&_MBAR[0x8658]))
-#define MCF_PSC0_PSCTFCNT                    (*(volatile uint16_t*)(&_MBAR[0x865C]))
-#define MCF_PSC0_PSCRFDR                     (*(volatile uint32_t*)(&_MBAR[0x8660]))
-#define MCF_PSC0_PSCRFSR                     (*(volatile uint16_t*)(&_MBAR[0x8664]))
-#define MCF_PSC0_PSCRFCR                     (*(volatile uint32_t*)(&_MBAR[0x8668]))
-#define MCF_PSC0_PSCRFAR                     (*(volatile uint16_t*)(&_MBAR[0x866E]))
-#define MCF_PSC0_PSCRFRP                     (*(volatile uint16_t*)(&_MBAR[0x8672]))
-#define MCF_PSC0_PSCRFWP                     (*(volatile uint16_t*)(&_MBAR[0x8676]))
-#define MCF_PSC0_PSCRLRFP                    (*(volatile uint16_t*)(&_MBAR[0x867A]))
-#define MCF_PSC0_PSCRLWFP                    (*(volatile uint16_t*)(&_MBAR[0x867E]))
-#define MCF_PSC0_PSCTFDR                     (*(volatile uint32_t*)(&_MBAR[0x8680]))
-#define MCF_PSC0_PSCTFSR                     (*(volatile uint16_t*)(&_MBAR[0x8684]))
-#define MCF_PSC0_PSCTFCR                     (*(volatile uint32_t*)(&_MBAR[0x8688]))
-#define MCF_PSC0_PSCTFAR                     (*(volatile uint16_t*)(&_MBAR[0x868E]))
-#define MCF_PSC0_PSCTFRP                     (*(volatile uint16_t*)(&_MBAR[0x8692]))
-#define MCF_PSC0_PSCTFWP                     (*(volatile uint16_t*)(&_MBAR[0x8696]))
-#define MCF_PSC0_PSCTLRFP                    (*(volatile uint16_t*)(&_MBAR[0x869A]))
-#define MCF_PSC0_PSCTLWFP                    (*(volatile uint16_t*)(&_MBAR[0x869E]))
-
-#define MCF_PSC1_PSCMR2                      (*(volatile uint8_t *)(&_MBAR[0x8700]))
-#define MCF_PSC1_PSCMR1                      (*(volatile uint8_t *)(&_MBAR[0x8700]))
-#define MCF_PSC1_PSCCSR                      (*(volatile uint8_t *)(&_MBAR[0x8704]))
-#define MCF_PSC1_PSCSR                       (*(volatile uint16_t*)(&_MBAR[0x8704]))
-#define MCF_PSC1_PSCCR                       (*(volatile uint8_t *)(&_MBAR[0x8708]))
-#define MCF_PSC1_PSCRB_8BIT                  (*(volatile uint32_t*)(&_MBAR[0x870C]))
-#define MCF_PSC1_PSCTB_8BIT                  (*(volatile uint32_t*)(&_MBAR[0x870C]))
-#define MCF_PSC1_PSCRB_16BIT                 (*(volatile uint32_t*)(&_MBAR[0x870C]))
-#define MCF_PSC1_PSCTB_16BIT                 (*(volatile uint32_t*)(&_MBAR[0x870C]))
-#define MCF_PSC1_PSCRB_AC97                  (*(volatile uint32_t*)(&_MBAR[0x870C]))
-#define MCF_PSC1_PSCTB_AC97                  (*(volatile uint32_t*)(&_MBAR[0x870C]))
-#define MCF_PSC1_PSCIPCR                     (*(volatile uint8_t *)(&_MBAR[0x8710]))
-#define MCF_PSC1_PSCACR                      (*(volatile uint8_t *)(&_MBAR[0x8710]))
-#define MCF_PSC1_PSCIMR                      (*(volatile uint16_t*)(&_MBAR[0x8714]))
-#define MCF_PSC1_PSCISR                      (*(volatile uint16_t*)(&_MBAR[0x8714]))
-#define MCF_PSC1_PSCCTUR                     (*(volatile uint8_t *)(&_MBAR[0x8718]))
-#define MCF_PSC1_PSCCTLR                     (*(volatile uint8_t *)(&_MBAR[0x871C]))
-#define MCF_PSC1_PSCIP                       (*(volatile uint8_t *)(&_MBAR[0x8734]))
-#define MCF_PSC1_PSCOPSET                    (*(volatile uint8_t *)(&_MBAR[0x8738]))
-#define MCF_PSC1_PSCOPRESET                  (*(volatile uint8_t *)(&_MBAR[0x873C]))
-#define MCF_PSC1_PSCSICR                     (*(volatile uint8_t *)(&_MBAR[0x8740]))
-#define MCF_PSC1_PSCIRCR1                    (*(volatile uint8_t *)(&_MBAR[0x8744]))
-#define MCF_PSC1_PSCIRCR2                    (*(volatile uint8_t *)(&_MBAR[0x8748]))
-#define MCF_PSC1_PSCIRSDR                    (*(volatile uint8_t *)(&_MBAR[0x874C]))
-#define MCF_PSC1_PSCIRMDR                    (*(volatile uint8_t *)(&_MBAR[0x8750]))
-#define MCF_PSC1_PSCIRFDR                    (*(volatile uint8_t *)(&_MBAR[0x8754]))
-#define MCF_PSC1_PSCRFCNT                    (*(volatile uint16_t*)(&_MBAR[0x8758]))
-#define MCF_PSC1_PSCTFCNT                    (*(volatile uint16_t*)(&_MBAR[0x875C]))
-#define MCF_PSC1_PSCRFDR                     (*(volatile uint32_t*)(&_MBAR[0x8760]))
-#define MCF_PSC1_PSCRFSR                     (*(volatile uint16_t*)(&_MBAR[0x8764]))
-#define MCF_PSC1_PSCRFCR                     (*(volatile uint32_t*)(&_MBAR[0x8768]))
-#define MCF_PSC1_PSCRFAR                     (*(volatile uint16_t*)(&_MBAR[0x876E]))
-#define MCF_PSC1_PSCRFRP                     (*(volatile uint16_t*)(&_MBAR[0x8772]))
-#define MCF_PSC1_PSCRFWP                     (*(volatile uint16_t*)(&_MBAR[0x8776]))
-#define MCF_PSC1_PSCRLRFP                    (*(volatile uint16_t*)(&_MBAR[0x877A]))
-#define MCF_PSC1_PSCRLWFP                    (*(volatile uint16_t*)(&_MBAR[0x877E]))
-#define MCF_PSC1_PSCTFDR                     (*(volatile uint32_t*)(&_MBAR[0x8780]))
-#define MCF_PSC1_PSCTFSR                     (*(volatile uint16_t*)(&_MBAR[0x8784]))
-#define MCF_PSC1_PSCTFCR                     (*(volatile uint32_t*)(&_MBAR[0x8788]))
-#define MCF_PSC1_PSCTFAR                     (*(volatile uint16_t*)(&_MBAR[0x878E]))
-#define MCF_PSC1_PSCTFRP                     (*(volatile uint16_t*)(&_MBAR[0x8792]))
-#define MCF_PSC1_PSCTFWP                     (*(volatile uint16_t*)(&_MBAR[0x8796]))
-#define MCF_PSC1_PSCTLRFP                    (*(volatile uint16_t*)(&_MBAR[0x879A]))
-#define MCF_PSC1_PSCTLWFP                    (*(volatile uint16_t*)(&_MBAR[0x879E]))
-
-#define MCF_PSC2_PSCMR2                      (*(volatile uint8_t *)(&_MBAR[0x8800]))
-#define MCF_PSC2_PSCMR1                      (*(volatile uint8_t *)(&_MBAR[0x8800]))
-#define MCF_PSC2_PSCCSR                      (*(volatile uint8_t *)(&_MBAR[0x8804]))
-#define MCF_PSC2_PSCSR                       (*(volatile uint16_t*)(&_MBAR[0x8804]))
-#define MCF_PSC2_PSCCR                       (*(volatile uint8_t *)(&_MBAR[0x8808]))
-#define MCF_PSC2_PSCRB_8BIT                  (*(volatile uint32_t*)(&_MBAR[0x880C]))
-#define MCF_PSC2_PSCTB_8BIT                  (*(volatile uint32_t*)(&_MBAR[0x880C]))
-#define MCF_PSC2_PSCRB_16BIT                 (*(volatile uint32_t*)(&_MBAR[0x880C]))
-#define MCF_PSC2_PSCTB_16BIT                 (*(volatile uint32_t*)(&_MBAR[0x880C]))
-#define MCF_PSC2_PSCRB_AC97                  (*(volatile uint32_t*)(&_MBAR[0x880C]))
-#define MCF_PSC2_PSCTB_AC97                  (*(volatile uint32_t*)(&_MBAR[0x880C]))
-#define MCF_PSC2_PSCIPCR                     (*(volatile uint8_t *)(&_MBAR[0x8810]))
-#define MCF_PSC2_PSCACR                      (*(volatile uint8_t *)(&_MBAR[0x8810]))
-#define MCF_PSC2_PSCIMR                      (*(volatile uint16_t*)(&_MBAR[0x8814]))
-#define MCF_PSC2_PSCISR                      (*(volatile uint16_t*)(&_MBAR[0x8814]))
-#define MCF_PSC2_PSCCTUR                     (*(volatile uint8_t *)(&_MBAR[0x8818]))
-#define MCF_PSC2_PSCCTLR                     (*(volatile uint8_t *)(&_MBAR[0x881C]))
-#define MCF_PSC2_PSCIP                       (*(volatile uint8_t *)(&_MBAR[0x8834]))
-#define MCF_PSC2_PSCOPSET                    (*(volatile uint8_t *)(&_MBAR[0x8838]))
-#define MCF_PSC2_PSCOPRESET                  (*(volatile uint8_t *)(&_MBAR[0x883C]))
-#define MCF_PSC2_PSCSICR                     (*(volatile uint8_t *)(&_MBAR[0x8840]))
-#define MCF_PSC2_PSCIRCR1                    (*(volatile uint8_t *)(&_MBAR[0x8844]))
-#define MCF_PSC2_PSCIRCR2                    (*(volatile uint8_t *)(&_MBAR[0x8848]))
-#define MCF_PSC2_PSCIRSDR                    (*(volatile uint8_t *)(&_MBAR[0x884C]))
-#define MCF_PSC2_PSCIRMDR                    (*(volatile uint8_t *)(&_MBAR[0x8850]))
-#define MCF_PSC2_PSCIRFDR                    (*(volatile uint8_t *)(&_MBAR[0x8854]))
-#define MCF_PSC2_PSCRFCNT                    (*(volatile uint16_t*)(&_MBAR[0x8858]))
-#define MCF_PSC2_PSCTFCNT                    (*(volatile uint16_t*)(&_MBAR[0x885C]))
-#define MCF_PSC2_PSCRFDR                     (*(volatile uint32_t*)(&_MBAR[0x8860]))
-#define MCF_PSC2_PSCRFSR                     (*(volatile uint16_t*)(&_MBAR[0x8864]))
-#define MCF_PSC2_PSCRFCR                     (*(volatile uint32_t*)(&_MBAR[0x8868]))
-#define MCF_PSC2_PSCRFAR                     (*(volatile uint16_t*)(&_MBAR[0x886E]))
-#define MCF_PSC2_PSCRFRP                     (*(volatile uint16_t*)(&_MBAR[0x8872]))
-#define MCF_PSC2_PSCRFWP                     (*(volatile uint16_t*)(&_MBAR[0x8876]))
-#define MCF_PSC2_PSCRLRFP                    (*(volatile uint16_t*)(&_MBAR[0x887A]))
-#define MCF_PSC2_PSCRLWFP                    (*(volatile uint16_t*)(&_MBAR[0x887E]))
-#define MCF_PSC2_PSCTFDR                     (*(volatile uint32_t*)(&_MBAR[0x8880]))
-#define MCF_PSC2_PSCTFSR                     (*(volatile uint16_t*)(&_MBAR[0x8884]))
-#define MCF_PSC2_PSCTFCR                     (*(volatile uint32_t*)(&_MBAR[0x8888]))
-#define MCF_PSC2_PSCTFAR                     (*(volatile uint16_t*)(&_MBAR[0x888E]))
-#define MCF_PSC2_PSCTFRP                     (*(volatile uint16_t*)(&_MBAR[0x8892]))
-#define MCF_PSC2_PSCTFWP                     (*(volatile uint16_t*)(&_MBAR[0x8896]))
-#define MCF_PSC2_PSCTLRFP                    (*(volatile uint16_t*)(&_MBAR[0x889A]))
-#define MCF_PSC2_PSCTLWFP                    (*(volatile uint16_t*)(&_MBAR[0x889E]))
-
-#define MCF_PSC3_PSCMR2                      (*(volatile uint8_t *)(&_MBAR[0x8900]))
-#define MCF_PSC3_PSCMR1                      (*(volatile uint8_t *)(&_MBAR[0x8900]))
-#define MCF_PSC3_PSCCSR                      (*(volatile uint8_t *)(&_MBAR[0x8904]))
-#define MCF_PSC3_PSCSR                       (*(volatile uint16_t*)(&_MBAR[0x8904]))
-#define MCF_PSC3_PSCCR                       (*(volatile uint8_t *)(&_MBAR[0x8908]))
-#define MCF_PSC3_PSCRB_8BIT                  (*(volatile uint32_t*)(&_MBAR[0x890C]))
-#define MCF_PSC3_PSCTB_8BIT                  (*(volatile uint32_t*)(&_MBAR[0x890C]))
-#define MCF_PSC3_PSCRB_16BIT                 (*(volatile uint32_t*)(&_MBAR[0x890C]))
-#define MCF_PSC3_PSCTB_16BIT                 (*(volatile uint32_t*)(&_MBAR[0x890C]))
-#define MCF_PSC3_PSCRB_AC97                  (*(volatile uint32_t*)(&_MBAR[0x890C]))
-#define MCF_PSC3_PSCTB_AC97                  (*(volatile uint32_t*)(&_MBAR[0x890C]))
-#define MCF_PSC3_PSCIPCR                     (*(volatile uint8_t *)(&_MBAR[0x8910]))
-#define MCF_PSC3_PSCACR                      (*(volatile uint8_t *)(&_MBAR[0x8910]))
-#define MCF_PSC3_PSCIMR                      (*(volatile uint16_t*)(&_MBAR[0x8914]))
-#define MCF_PSC3_PSCISR                      (*(volatile uint16_t*)(&_MBAR[0x8914]))
-#define MCF_PSC3_PSCCTUR                     (*(volatile uint8_t *)(&_MBAR[0x8918]))
-#define MCF_PSC3_PSCCTLR                     (*(volatile uint8_t *)(&_MBAR[0x891C]))
-#define MCF_PSC3_PSCIP                       (*(volatile uint8_t *)(&_MBAR[0x8934]))
-#define MCF_PSC3_PSCOPSET                    (*(volatile uint8_t *)(&_MBAR[0x8938]))
-#define MCF_PSC3_PSCOPRESET                  (*(volatile uint8_t *)(&_MBAR[0x893C]))
-#define MCF_PSC3_PSCSICR                     (*(volatile uint8_t *)(&_MBAR[0x8940]))
-#define MCF_PSC3_PSCIRCR1                    (*(volatile uint8_t *)(&_MBAR[0x8944]))
-#define MCF_PSC3_PSCIRCR2                    (*(volatile uint8_t *)(&_MBAR[0x8948]))
-#define MCF_PSC3_PSCIRSDR                    (*(volatile uint8_t *)(&_MBAR[0x894C]))
-#define MCF_PSC3_PSCIRMDR                    (*(volatile uint8_t *)(&_MBAR[0x8950]))
-#define MCF_PSC3_PSCIRFDR                    (*(volatile uint8_t *)(&_MBAR[0x8954]))
-#define MCF_PSC3_PSCRFCNT                    (*(volatile uint16_t*)(&_MBAR[0x8958]))
-#define MCF_PSC3_PSCTFCNT                    (*(volatile uint16_t*)(&_MBAR[0x895C]))
-#define MCF_PSC3_PSCRFDR                     (*(volatile uint32_t*)(&_MBAR[0x8960]))
-#define MCF_PSC3_PSCRFSR                     (*(volatile uint16_t*)(&_MBAR[0x8964]))
-#define MCF_PSC3_PSCRFCR                     (*(volatile uint32_t*)(&_MBAR[0x8968]))
-#define MCF_PSC3_PSCRFAR                     (*(volatile uint16_t*)(&_MBAR[0x896E]))
-#define MCF_PSC3_PSCRFRP                     (*(volatile uint16_t*)(&_MBAR[0x8972]))
-#define MCF_PSC3_PSCRFWP                     (*(volatile uint16_t*)(&_MBAR[0x8976]))
-#define MCF_PSC3_PSCRLRFP                    (*(volatile uint16_t*)(&_MBAR[0x897A]))
-#define MCF_PSC3_PSCRLWFP                    (*(volatile uint16_t*)(&_MBAR[0x897E]))
-#define MCF_PSC3_PSCTFDR                     (*(volatile uint32_t*)(&_MBAR[0x8980]))
-#define MCF_PSC3_PSCTFSR                     (*(volatile uint16_t*)(&_MBAR[0x8984]))
-#define MCF_PSC3_PSCTFCR                     (*(volatile uint32_t*)(&_MBAR[0x8988]))
-#define MCF_PSC3_PSCTFAR                     (*(volatile uint16_t*)(&_MBAR[0x898E]))
-#define MCF_PSC3_PSCTFRP                     (*(volatile uint16_t*)(&_MBAR[0x8992]))
-#define MCF_PSC3_PSCTFWP                     (*(volatile uint16_t*)(&_MBAR[0x8996]))
-#define MCF_PSC3_PSCTLRFP                    (*(volatile uint16_t*)(&_MBAR[0x899A]))
-#define MCF_PSC3_PSCTLWFP                    (*(volatile uint16_t*)(&_MBAR[0x899E]))
-
-#define MCF_PSC_PSCMR(x)                     (*(volatile uint8_t *)(&_MBAR[0x8600 + ((x)*0x100)]))
-#define MCF_PSC_PSCCSR(x)                    (*(volatile uint8_t *)(&_MBAR[0x8604 + ((x)*0x100)]))
-#define MCF_PSC_PSCSR(x)                     (*(volatile uint16_t*)(&_MBAR[0x8604 + ((x)*0x100)]))
-#define MCF_PSC_PSCCR(x)                     (*(volatile uint8_t *)(&_MBAR[0x8608 + ((x)*0x100)]))
-#define MCF_PSC_PSCRB_8BIT(x)                (*(volatile uint32_t*)(&_MBAR[0x860C + ((x)*0x100)]))
-#define MCF_PSC_PSCTB_8BIT(x)                (*(volatile uint32_t*)(&_MBAR[0x860C + ((x)*0x100)]))
-#define MCF_PSC_PSCRB_16BIT(x)               (*(volatile uint32_t*)(&_MBAR[0x860C + ((x)*0x100)]))
-#define MCF_PSC_PSCTB_16BIT(x)               (*(volatile uint32_t*)(&_MBAR[0x860C + ((x)*0x100)]))
-#define MCF_PSC_PSCRB_AC97(x)                (*(volatile uint32_t*)(&_MBAR[0x860C + ((x)*0x100)]))
-#define MCF_PSC_PSCTB_AC97(x)                (*(volatile uint32_t*)(&_MBAR[0x860C + ((x)*0x100)]))
-#define MCF_PSC_PSCIPCR(x)                   (*(volatile uint8_t *)(&_MBAR[0x8610 + ((x)*0x100)]))
-#define MCF_PSC_PSCACR(x)                    (*(volatile uint8_t *)(&_MBAR[0x8610 + ((x)*0x100)]))
-#define MCF_PSC_PSCIMR(x)                    (*(volatile uint16_t*)(&_MBAR[0x8614 + ((x)*0x100)]))
-#define MCF_PSC_PSCISR(x)                    (*(volatile uint16_t*)(&_MBAR[0x8614 + ((x)*0x100)]))
-#define MCF_PSC_PSCCTUR(x)                   (*(volatile uint8_t *)(&_MBAR[0x8618 + ((x)*0x100)]))
-#define MCF_PSC_PSCCTLR(x)                   (*(volatile uint8_t *)(&_MBAR[0x861C + ((x)*0x100)]))
-#define MCF_PSC_PSCIP(x)                     (*(volatile uint8_t *)(&_MBAR[0x8634 + ((x)*0x100)]))
-#define MCF_PSC_PSCOPSET(x)                  (*(volatile uint8_t *)(&_MBAR[0x8638 + ((x)*0x100)]))
-#define MCF_PSC_PSCOPRESET(x)                (*(volatile uint8_t *)(&_MBAR[0x863C + ((x)*0x100)]))
-#define MCF_PSC_PSCSICR(x)                   (*(volatile uint8_t *)(&_MBAR[0x8640 + ((x)*0x100)]))
-#define MCF_PSC_PSCIRCR1(x)                  (*(volatile uint8_t *)(&_MBAR[0x8644 + ((x)*0x100)]))
-#define MCF_PSC_PSCIRCR2(x)                  (*(volatile uint8_t *)(&_MBAR[0x8648 + ((x)*0x100)]))
-#define MCF_PSC_PSCIRSDR(x)                  (*(volatile uint8_t *)(&_MBAR[0x864C + ((x)*0x100)]))
-#define MCF_PSC_PSCIRMDR(x)                  (*(volatile uint8_t *)(&_MBAR[0x8650 + ((x)*0x100)]))
-#define MCF_PSC_PSCIRFDR(x)                  (*(volatile uint8_t *)(&_MBAR[0x8654 + ((x)*0x100)]))
-#define MCF_PSC_PSCRFCNT(x)                  (*(volatile uint16_t*)(&_MBAR[0x8658 + ((x)*0x100)]))
-#define MCF_PSC_PSCTFCNT(x)                  (*(volatile uint16_t*)(&_MBAR[0x865C + ((x)*0x100)]))
-#define MCF_PSC_PSCRFDR(x)                   (*(volatile uint32_t*)(&_MBAR[0x8660 + ((x)*0x100)]))
-#define MCF_PSC_PSCRFSR(x)                   (*(volatile uint16_t*)(&_MBAR[0x8664 + ((x)*0x100)]))
-#define MCF_PSC_PSCRFCR(x)                   (*(volatile uint32_t*)(&_MBAR[0x8668 + ((x)*0x100)]))
-#define MCF_PSC_PSCRFAR(x)                   (*(volatile uint16_t*)(&_MBAR[0x866E + ((x)*0x100)]))
-#define MCF_PSC_PSCRFRP(x)                   (*(volatile uint16_t*)(&_MBAR[0x8672 + ((x)*0x100)]))
-#define MCF_PSC_PSCRFWP(x)                   (*(volatile uint16_t*)(&_MBAR[0x8676 + ((x)*0x100)]))
-#define MCF_PSC_PSCRLRFP(x)                  (*(volatile uint16_t*)(&_MBAR[0x867A + ((x)*0x100)]))
-#define MCF_PSC_PSCRLWFP(x)                  (*(volatile uint16_t*)(&_MBAR[0x867E + ((x)*0x100)]))
-#define MCF_PSC_PSCTFDR(x)                   (*(volatile uint32_t*)(&_MBAR[0x8680 + ((x)*0x100)]))
-#define MCF_PSC_PSCTFSR(x)                   (*(volatile uint16_t*)(&_MBAR[0x8684 + ((x)*0x100)]))
-#define MCF_PSC_PSCTFCR(x)                   (*(volatile uint32_t*)(&_MBAR[0x8688 + ((x)*0x100)]))
-#define MCF_PSC_PSCTFAR(x)                   (*(volatile uint16_t*)(&_MBAR[0x868E + ((x)*0x100)]))
-#define MCF_PSC_PSCTFRP(x)                   (*(volatile uint16_t*)(&_MBAR[0x8692 + ((x)*0x100)]))
-#define MCF_PSC_PSCTFWP(x)                   (*(volatile uint16_t*)(&_MBAR[0x8696 + ((x)*0x100)]))
-#define MCF_PSC_PSCTLRFP(x)                  (*(volatile uint16_t*)(&_MBAR[0x869A + ((x)*0x100)]))
-#define MCF_PSC_PSCTLWFP(x)                  (*(volatile uint16_t*)(&_MBAR[0x869E + ((x)*0x100)]))
-
-/* Bit definitions and macros for MCF_PSC_PSCMR */
-#define MCF_PSC_PSCMR_SB(x)                  (((x)&0xF)<<0)
-#define MCF_PSC_PSCMR_TXCTS                  (0x10)
-#define MCF_PSC_PSCMR_TXRTS                  (0x20)
-#define MCF_PSC_PSCMR_CM(x)                  (((x)&0x3)<<0x6)
-#define MCF_PSC_PSCMR_CM_NORMAL              (0)
-#define MCF_PSC_PSCMR_CM_ECHO                (0x40)
-#define MCF_PSC_PSCMR_CM_LOCAL_LOOP          (0x80)
-#define MCF_PSC_PSCMR_CM_REMOTE_LOOP         (0xC0)
-#define MCF_PSC_PSCMR_SB_STOP_BITS_1         (0x7)
-#define MCF_PSC_PSCMR_SB_STOP_BITS_15        (0x8)
-#define MCF_PSC_PSCMR_SB_STOP_BITS_2         (0xF)
-#define MCF_PSC_PSCMR_PM_MULTI_ADDR          (0x1C)
-#define MCF_PSC_PSCMR_PM_MULTI_DATA          (0x18)
-#define MCF_PSC_PSCMR_PM_NONE                (0x10)
-#define MCF_PSC_PSCMR_PM_FORCE_HI            (0xC)
-#define MCF_PSC_PSCMR_PM_FORCE_LO            (0x8)
-#define MCF_PSC_PSCMR_PM_ODD                 (0x4)
-#define MCF_PSC_PSCMR_PM_EVEN                (0)
-#define MCF_PSC_PSCMR_BC(x)                  (((x)&0x3)<<0)
-#define MCF_PSC_PSCMR_BC_5                   (0)
-#define MCF_PSC_PSCMR_BC_6                   (0x1)
-#define MCF_PSC_PSCMR_BC_7                   (0x2)
-#define MCF_PSC_PSCMR_BC_8                   (0x3)
-#define MCF_PSC_PSCMR_PT                     (0x4)
-#define MCF_PSC_PSCMR_PM(x)                  (((x)&0x3)<<0x3)
-#define MCF_PSC_PSCMR_ERR                    (0x20)
-#define MCF_PSC_PSCMR_RXIRQ_FU               (0x40)
-#define MCF_PSC_PSCMR_RXRTS                  (0x80)
-
-/* Bit definitions and macros for MCF_PSC_PSCCSR */
-#define MCF_PSC_PSCCSR_TCSEL(x)              (((x)&0xF)<<0)
-#define MCF_PSC_PSCCSR_RCSEL(x)              (((x)&0xF)<<0x4)
-#define MCF_PSC_PSCCSR_TCSEL_SYS_CLK         (0x0D)
-#define MCF_PSC_PSCCSR_TCSEL_CTM16           (0x0E)
-#define MCF_PSC_PSCCSR_TCSEL_CTM             (0x0F)
-#define MCF_PSC_PSCCSR_RCSEL_SYS_CLK         (0xD0)
-#define MCF_PSC_PSCCSR_RCSEL_CTM16           (0xE0)
-#define MCF_PSC_PSCCSR_RCSEL_CTM             (0xF0)
-
-/* Bit definitions and macros for MCF_PSC_PSCSR */
-#define MCF_PSC_PSCSR_ERR                    (0x40)
-#define MCF_PSC_PSCSR_CDE_DEOF               (0x80)
-#define MCF_PSC_PSCSR_RXRDY                  (0x100)
-#define MCF_PSC_PSCSR_FU                     (0x200)
-#define MCF_PSC_PSCSR_TXRDY                  (0x400)
-#define MCF_PSC_PSCSR_TXEMP_URERR            (0x800)
-#define MCF_PSC_PSCSR_OE                     (0x1000)
-#define MCF_PSC_PSCSR_PE_CRCERR              (0x2000)
-#define MCF_PSC_PSCSR_FE_PHYERR              (0x4000)
-#define MCF_PSC_PSCSR_RB_NEOF                (0x8000)
-
-/* Bit definitions and macros for MCF_PSC_PSCCR */
-#define MCF_PSC_PSCCR_RXC(x)                 (((x)&0x3)<<0)
-#define MCF_PSC_PSCCR_RX_ENABLED             (0x1)
-#define MCF_PSC_PSCCR_RX_DISABLED            (0x2)
-#define MCF_PSC_PSCCR_TXC(x)                 (((x)&0x3)<<0x2)
-#define MCF_PSC_PSCCR_TX_ENABLED             (0x4)
-#define MCF_PSC_PSCCR_TX_DISABLED            (0x8)
-#define MCF_PSC_PSCCR_MISC(x)                (((x)&0x7)<<0x4)
-#define MCF_PSC_PSCCR_NONE                   (0)
-#define MCF_PSC_PSCCR_RESET_MR               (0x10)
-#define MCF_PSC_PSCCR_RESET_RX               (0x20)
-#define MCF_PSC_PSCCR_RESET_TX               (0x30)
-#define MCF_PSC_PSCCR_RESET_ERROR            (0x40)
-#define MCF_PSC_PSCCR_RESET_BKCHGINT         (0x50)
-#define MCF_PSC_PSCCR_START_BREAK            (0x60)
-#define MCF_PSC_PSCCR_STOP_BREAK             (0x70)
-
-/* Bit definitions and macros for MCF_PSC_PSCRB_8BIT */
-#define MCF_PSC_PSCRB_8BIT_RB3(x)            (((x)&0xFF)<<0)
-#define MCF_PSC_PSCRB_8BIT_RB2(x)            (((x)&0xFF)<<0x8)
-#define MCF_PSC_PSCRB_8BIT_RB1(x)            (((x)&0xFF)<<0x10)
-#define MCF_PSC_PSCRB_8BIT_RB0(x)            (((x)&0xFF)<<0x18)
-
-/* Bit definitions and macros for MCF_PSC_PSCTB_8BIT */
-#define MCF_PSC_PSCTB_8BIT_TB3(x)            (((x)&0xFF)<<0)
-#define MCF_PSC_PSCTB_8BIT_TB2(x)            (((x)&0xFF)<<0x8)
-#define MCF_PSC_PSCTB_8BIT_TB1(x)            (((x)&0xFF)<<0x10)
-#define MCF_PSC_PSCTB_8BIT_TB0(x)            (((x)&0xFF)<<0x18)
-
-/* Bit definitions and macros for MCF_PSC_PSCRB_16BIT */
-#define MCF_PSC_PSCRB_16BIT_RB1(x)           (((x)&0xFFFF)<<0)
-#define MCF_PSC_PSCRB_16BIT_RB0(x)           (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_PSC_PSCTB_16BIT */
-#define MCF_PSC_PSCTB_16BIT_TB1(x)           (((x)&0xFFFF)<<0)
-#define MCF_PSC_PSCTB_16BIT_TB0(x)           (((x)&0xFFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_PSC_PSCRB_AC97 */
-#define MCF_PSC_PSCRB_AC97_SOF               (0x800)
-#define MCF_PSC_PSCRB_AC97_RB(x)             (((x)&0xFFFFF)<<0xC)
-
-/* Bit definitions and macros for MCF_PSC_PSCTB_AC97 */
-#define MCF_PSC_PSCTB_AC97_TB(x)             (((x)&0xFFFFF)<<0xC)
-
-/* Bit definitions and macros for MCF_PSC_PSCIPCR */
-#define MCF_PSC_PSCIPCR_RESERVED             (0xC)
-#define MCF_PSC_PSCIPCR_CTS                  (0xD)
-#define MCF_PSC_PSCIPCR_D_CTS                (0x1C)
-#define MCF_PSC_PSCIPCR_SYNC                 (0x8C)
-
-/* Bit definitions and macros for MCF_PSC_PSCACR */
-#define MCF_PSC_PSCACR_IEC0                  (0x1)
-
-/* Bit definitions and macros for MCF_PSC_PSCIMR */
-#define MCF_PSC_PSCIMR_ERR                   (0x40)
-#define MCF_PSC_PSCIMR_DEOF                  (0x80)
-#define MCF_PSC_PSCIMR_TXRDY                 (0x100)
-#define MCF_PSC_PSCIMR_RXRDY_FU              (0x200)
-#define MCF_PSC_PSCIMR_DB                    (0x400)
-#define MCF_PSC_PSCIMR_IPC                   (0x8000)
-
-/* Bit definitions and macros for MCF_PSC_PSCISR */
-#define MCF_PSC_PSCISR_ERR                   (0x40)
-#define MCF_PSC_PSCISR_DEOF                  (0x80)
-#define MCF_PSC_PSCISR_TXRDY                 (0x100)
-#define MCF_PSC_PSCISR_RXRDY_FU              (0x200)
-#define MCF_PSC_PSCISR_DB                    (0x400)
-#define MCF_PSC_PSCISR_IPC                   (0x8000)
-
-/* Bit definitions and macros for MCF_PSC_PSCCTUR */
-#define MCF_PSC_PSCCTUR_CT(x)                (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCCTLR */
-#define MCF_PSC_PSCCTLR_CT(x)                (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCIP */
-#define MCF_PSC_PSCIP_CTS                    (0x1)
-#define MCF_PSC_PSCIP_TGL                    (0x40)
-#define MCF_PSC_PSCIP_LPWR_B                 (0x80)
-
-/* Bit definitions and macros for MCF_PSC_PSCOPSET */
-#define MCF_PSC_PSCOPSET_RTS                 (0x1)
-
-/* Bit definitions and macros for MCF_PSC_PSCOPRESET */
-#define MCF_PSC_PSCOPRESET_RTS               (0x1)
-
-/* Bit definitions and macros for MCF_PSC_PSCSICR */
-#define MCF_PSC_PSCSICR_SIM(x)               (((x)&0x7)<<0)
-#define MCF_PSC_PSCSICR_SIM_UART             (0)
-#define MCF_PSC_PSCSICR_SIM_MODEM8           (0x1)
-#define MCF_PSC_PSCSICR_SIM_MODEM16          (0x2)
-#define MCF_PSC_PSCSICR_SIM_AC97             (0x3)
-#define MCF_PSC_PSCSICR_SIM_SIR              (0x4)
-#define MCF_PSC_PSCSICR_SIM_MIR              (0x5)
-#define MCF_PSC_PSCSICR_SIM_FIR              (0x6)
-#define MCF_PSC_PSCSICR_SHDIR                (0x10)
-#define MCF_PSC_PSCSICR_DTS1                 (0x20)
-#define MCF_PSC_PSCSICR_AWR                  (0x40)
-#define MCF_PSC_PSCSICR_ACRB                 (0x80)
-
-/* Bit definitions and macros for MCF_PSC_PSCIRCR1 */
-#define MCF_PSC_PSCIRCR1_SPUL                (0x1)
-#define MCF_PSC_PSCIRCR1_SIPEN               (0x2)
-#define MCF_PSC_PSCIRCR1_FD                  (0x4)
-
-/* Bit definitions and macros for MCF_PSC_PSCIRCR2 */
-#define MCF_PSC_PSCIRCR2_NXTEOF              (0x1)
-#define MCF_PSC_PSCIRCR2_ABORT               (0x2)
-#define MCF_PSC_PSCIRCR2_SIPREQ              (0x4)
-
-/* Bit definitions and macros for MCF_PSC_PSCIRSDR */
-#define MCF_PSC_PSCIRSDR_IRSTIM(x)           (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCIRMDR */
-#define MCF_PSC_PSCIRMDR_M_FDIV(x)           (((x)&0x7F)<<0)
-#define MCF_PSC_PSCIRMDR_FREQ                (0x80)
-
-/* Bit definitions and macros for MCF_PSC_PSCIRFDR */
-#define MCF_PSC_PSCIRFDR_F_FDIV(x)           (((x)&0xF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCRFCNT */
-#define MCF_PSC_PSCRFCNT_CNT(x)              (((x)&0x1FF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCTFCNT */
-#define MCF_PSC_PSCTFCNT_CNT(x)              (((x)&0x1FF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCRFDR */
-#define MCF_PSC_PSCRFDR_DATA(x)              (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCRFSR */
-#define MCF_PSC_PSCRFSR_EMT                  (0x1)
-#define MCF_PSC_PSCRFSR_ALARM                (0x2)
-#define MCF_PSC_PSCRFSR_FU                   (0x4)
-#define MCF_PSC_PSCRFSR_FRMRDY               (0x8)
-#define MCF_PSC_PSCRFSR_OF                   (0x10)
-#define MCF_PSC_PSCRFSR_UF                   (0x20)
-#define MCF_PSC_PSCRFSR_RXW                  (0x40)
-#define MCF_PSC_PSCRFSR_FAE                  (0x80)
-#define MCF_PSC_PSCRFSR_FRM(x)               (((x)&0xF)<<0x8)
-#define MCF_PSC_PSCRFSR_FRM_BYTE0            (0x800)
-#define MCF_PSC_PSCRFSR_FRM_BYTE1            (0x400)
-#define MCF_PSC_PSCRFSR_FRM_BYTE2            (0x200)
-#define MCF_PSC_PSCRFSR_FRM_BYTE3            (0x100)
-#define MCF_PSC_PSCRFSR_TAG(x)               (((x)&0x3)<<0xC)
-#define MCF_PSC_PSCRFSR_TXW                  (0x4000)
-#define MCF_PSC_PSCRFSR_IP                   (0x8000)
-
-/* Bit definitions and macros for MCF_PSC_PSCRFCR */
-#define MCF_PSC_PSCRFCR_CNTR(x)              (((x)&0xFFFF)<<0)
-#define MCF_PSC_PSCRFCR_TXW_MSK              (0x40000)
-#define MCF_PSC_PSCRFCR_OF_MSK               (0x80000)
-#define MCF_PSC_PSCRFCR_UF_MSK               (0x100000)
-#define MCF_PSC_PSCRFCR_RXW_MSK              (0x200000)
-#define MCF_PSC_PSCRFCR_FAE_MSK              (0x400000)
-#define MCF_PSC_PSCRFCR_IP_MSK               (0x800000)
-#define MCF_PSC_PSCRFCR_GR(x)                (((x)&0x7)<<0x18)
-#define MCF_PSC_PSCRFCR_FRMEN                (0x8000000)
-#define MCF_PSC_PSCRFCR_TIMER                (0x10000000)
-
-/* Bit definitions and macros for MCF_PSC_PSCRFAR */
-#define MCF_PSC_PSCRFAR_ALARM(x)             (((x)&0x1FF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCRFRP */
-#define MCF_PSC_PSCRFRP_READ(x)              (((x)&0x1FF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCRFWP */
-#define MCF_PSC_PSCRFWP_WRITE(x)             (((x)&0x1FF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCRLRFP */
-#define MCF_PSC_PSCRLRFP_LRFP(x)             (((x)&0x1FF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCRLWFP */
-#define MCF_PSC_PSCRLWFP_LWFP(x)             (((x)&0x1FF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCTFDR */
-#define MCF_PSC_PSCTFDR_DATA(x)              (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCTFSR */
-#define MCF_PSC_PSCTFSR_EMT                  (0x1)
-#define MCF_PSC_PSCTFSR_ALARM                (0x2)
-#define MCF_PSC_PSCTFSR_FU                   (0x4)
-#define MCF_PSC_PSCTFSR_FRMRDY               (0x8)
-#define MCF_PSC_PSCTFSR_OF                   (0x10)
-#define MCF_PSC_PSCTFSR_UF                   (0x20)
-#define MCF_PSC_PSCTFSR_RXW                  (0x40)
-#define MCF_PSC_PSCTFSR_FAE                  (0x80)
-#define MCF_PSC_PSCTFSR_FRM(x)               (((x)&0xF)<<0x8)
-#define MCF_PSC_PSCTFSR_FRM_BYTE0            (0x800)
-#define MCF_PSC_PSCTFSR_FRM_BYTE1            (0x400)
-#define MCF_PSC_PSCTFSR_FRM_BYTE2            (0x200)
-#define MCF_PSC_PSCTFSR_FRM_BYTE3            (0x100)
-#define MCF_PSC_PSCTFSR_TAG(x)               (((x)&0x3)<<0xC)
-#define MCF_PSC_PSCTFSR_TXW                  (0x4000)
-#define MCF_PSC_PSCTFSR_IP                   (0x8000)
-
-/* Bit definitions and macros for MCF_PSC_PSCTFCR */
-#define MCF_PSC_PSCTFCR_CNTR(x)              (((x)&0xFFFF)<<0)
-#define MCF_PSC_PSCTFCR_TXW_MSK              (0x40000)
-#define MCF_PSC_PSCTFCR_OF_MSK               (0x80000)
-#define MCF_PSC_PSCTFCR_UF_MSK               (0x100000)
-#define MCF_PSC_PSCTFCR_RXW_MSK              (0x200000)
-#define MCF_PSC_PSCTFCR_FAE_MSK              (0x400000)
-#define MCF_PSC_PSCTFCR_IP_MSK               (0x800000)
-#define MCF_PSC_PSCTFCR_GR(x)                (((x)&0x7)<<0x18)
-#define MCF_PSC_PSCTFCR_FRMEN                (0x8000000)
-#define MCF_PSC_PSCTFCR_TIMER                (0x10000000)
-#define MCF_PSC_PSCTFCR_WFR                  (0x20000000)
-
-/* Bit definitions and macros for MCF_PSC_PSCTFAR */
-#define MCF_PSC_PSCTFAR_ALARM(x)             (((x)&0x1FF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCTFRP */
-#define MCF_PSC_PSCTFRP_READ(x)              (((x)&0x1FF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCTFWP */
-#define MCF_PSC_PSCTFWP_WRITE(x)             (((x)&0x1FF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCTLRFP */
-#define MCF_PSC_PSCTLRFP_LRFP(x)             (((x)&0x1FF)<<0)
-
-/* Bit definitions and macros for MCF_PSC_PSCTLWFP */
-#define MCF_PSC_PSCTLWFP_LWFP(x)             (((x)&0x1FF)<<0)
-
-
-#endif /* __MCF5475_PSC_H__ */
--- a/tos/jtagwait/include/MCF5475_SDRAMC.h
+++ b/tos/jtagwait/include/MCF5475_SDRAMC.h
@@ -1,106 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_SDRAMC_H__
-#define __MCF5475_SDRAMC_H__
-
-
-/*********************************************************************
-*
-* Synchronous DRAM Controller (SDRAMC)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_SDRAMC_SDRAMDS                   (*(volatile uint32_t*)(&_MBAR[0x4]))
-#define MCF_SDRAMC_CS0CFG                    (*(volatile uint32_t*)(&_MBAR[0x20]))
-#define MCF_SDRAMC_CS1CFG                    (*(volatile uint32_t*)(&_MBAR[0x24]))
-#define MCF_SDRAMC_CS2CFG                    (*(volatile uint32_t*)(&_MBAR[0x28]))
-#define MCF_SDRAMC_CS3CFG                    (*(volatile uint32_t*)(&_MBAR[0x2C]))
-#define MCF_SDRAMC_SDMR                      (*(volatile uint32_t*)(&_MBAR[0x100]))
-#define MCF_SDRAMC_SDCR                      (*(volatile uint32_t*)(&_MBAR[0x104]))
-#define MCF_SDRAMC_SDCFG1                    (*(volatile uint32_t*)(&_MBAR[0x108]))
-#define MCF_SDRAMC_SDCFG2                    (*(volatile uint32_t*)(&_MBAR[0x10C]))
-#define MCF_SDRAMC_CSCFG(x)                  (*(volatile uint32_t*)(&_MBAR[0x20 + ((x)*0x4)]))
-
-
-/* Bit definitions and macros for MCF_SDRAMC_SDRAMDS */
-#define MCF_SDRAMC_SDRAMDS_SB_D(x)           (((x)&0x3)<<0)
-#define MCF_SDRAMC_SDRAMDS_SB_S(x)           (((x)&0x3)<<0x2)
-#define MCF_SDRAMC_SDRAMDS_SB_A(x)           (((x)&0x3)<<0x4)
-#define MCF_SDRAMC_SDRAMDS_SB_C(x)           (((x)&0x3)<<0x6)
-#define MCF_SDRAMC_SDRAMDS_SB_E(x)           (((x)&0x3)<<0x8)
-#define MCF_SDRAMC_SDRAMDS_DRIVE_24MA        (0)
-#define MCF_SDRAMC_SDRAMDS_DRIVE_16MA        (0x1)
-#define MCF_SDRAMC_SDRAMDS_DRIVE_8MA         (0x2)
-#define MCF_SDRAMC_SDRAMDS_DRIVE_NONE        (0x3)
-
-/* Bit definitions and macros for MCF_SDRAMC_CSCFG */
-#define MCF_SDRAMC_CSCFG_CSSZ(x)             (((x)&0x1F)<<0)
-#define MCF_SDRAMC_CSCFG_CSSZ_DISABLED       (0)
-#define MCF_SDRAMC_CSCFG_CSSZ_1MBYTE         (0x13)
-#define MCF_SDRAMC_CSCFG_CSSZ_2MBYTE         (0x14)
-#define MCF_SDRAMC_CSCFG_CSSZ_4MBYTE         (0x15)
-#define MCF_SDRAMC_CSCFG_CSSZ_8MBYTE         (0x16)
-#define MCF_SDRAMC_CSCFG_CSSZ_16MBYTE        (0x17)
-#define MCF_SDRAMC_CSCFG_CSSZ_32MBYTE        (0x18)
-#define MCF_SDRAMC_CSCFG_CSSZ_64MBYTE        (0x19)
-#define MCF_SDRAMC_CSCFG_CSSZ_128MBYTE       (0x1A)
-#define MCF_SDRAMC_CSCFG_CSSZ_256MBYTE       (0x1B)
-#define MCF_SDRAMC_CSCFG_CSSZ_512MBYTE       (0x1C)
-#define MCF_SDRAMC_CSCFG_CSSZ_1GBYTE         (0x1D)
-#define MCF_SDRAMC_CSCFG_CSSZ_2GBYTE         (0x1E)
-#define MCF_SDRAMC_CSCFG_CSSZ_4GBYTE         (0x1F)
-#define MCF_SDRAMC_CSCFG_CSBA(x)             (((x)&0xFFF)<<0x14)
-#define MCF_SDRAMC_CSCFG_BA(x)               ((x)&0xFFF00000)
-
-/* Bit definitions and macros for MCF_SDRAMC_SDMR */
-#define MCF_SDRAMC_SDMR_CMD                  (0x10000)
-#define MCF_SDRAMC_SDMR_AD(x)                (((x)&0xFFF)<<0x12)
-#define MCF_SDRAMC_SDMR_BNKAD(x)             (((x)&0x3)<<0x1E)
-#define MCF_SDRAMC_SDMR_BK_LMR               (0)
-#define MCF_SDRAMC_SDMR_BK_LEMR              (0x40000000)
-
-/* Bit definitions and macros for MCF_SDRAMC_SDCR */
-#define MCF_SDRAMC_SDCR_IPALL                (0x2)
-#define MCF_SDRAMC_SDCR_IREF                 (0x4)
-#define MCF_SDRAMC_SDCR_BUFF                 (0x10)
-#define MCF_SDRAMC_SDCR_DQS_OE(x)            (((x)&0xF)<<0x8)
-#define MCF_SDRAMC_SDCR_RCNT(x)              (((x)&0x3F)<<0x10)
-#define MCF_SDRAMC_SDCR_DRIVE                (0x400000)
-#define MCF_SDRAMC_SDCR_AP                   (0x800000)
-#define MCF_SDRAMC_SDCR_MUX(x)               (((x)&0x3)<<0x18)
-#define MCF_SDRAMC_SDCR_REF                  (0x10000000)
-#define MCF_SDRAMC_SDCR_DDR                  (0x20000000)
-#define MCF_SDRAMC_SDCR_CKE                  (0x40000000)
-#define MCF_SDRAMC_SDCR_MODE_EN              (0x80000000)
-
-/* Bit definitions and macros for MCF_SDRAMC_SDCFG1 */
-#define MCF_SDRAMC_SDCFG1_WTLAT(x)           (((x)&0x7)<<0x4)
-#define MCF_SDRAMC_SDCFG1_REF2ACT(x)         (((x)&0xF)<<0x8)
-#define MCF_SDRAMC_SDCFG1_PRE2ACT(x)         (((x)&0x7)<<0xC)
-#define MCF_SDRAMC_SDCFG1_ACT2RW(x)          (((x)&0x7)<<0x10)
-#define MCF_SDRAMC_SDCFG1_RDLAT(x)           (((x)&0xF)<<0x14)
-#define MCF_SDRAMC_SDCFG1_SWT2RD(x)          (((x)&0x7)<<0x18)
-#define MCF_SDRAMC_SDCFG1_SRD2RW(x)          (((x)&0xF)<<0x1C)
-
-/* Bit definitions and macros for MCF_SDRAMC_SDCFG2 */
-#define MCF_SDRAMC_SDCFG2_BL(x)              (((x)&0xF)<<0x10)
-#define MCF_SDRAMC_SDCFG2_BRD2WT(x)          (((x)&0xF)<<0x14)
-#define MCF_SDRAMC_SDCFG2_BWT2RW(x)          (((x)&0xF)<<0x18)
-#define MCF_SDRAMC_SDCFG2_BRD2PRE(x)         (((x)&0xF)<<0x1C)
-
-
-#endif /* __MCF5475_SDRAMC_H__ */
--- a/tos/jtagwait/include/MCF5475_SEC.h
+++ b/tos/jtagwait/include/MCF5475_SEC.h
@@ -1,398 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_SEC_H__
-#define __MCF5475_SEC_H__
-
-
-/*********************************************************************
-*
-* Integrated Security Engine (SEC)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_SEC_EUACRH                       (*(volatile uint32_t*)(&_MBAR[0x21000]))
-#define MCF_SEC_EUACRL                       (*(volatile uint32_t*)(&_MBAR[0x21004]))
-#define MCF_SEC_SIMRH                        (*(volatile uint32_t*)(&_MBAR[0x21008]))
-#define MCF_SEC_SIMRL                        (*(volatile uint32_t*)(&_MBAR[0x2100C]))
-#define MCF_SEC_SISRH                        (*(volatile uint32_t*)(&_MBAR[0x21010]))
-#define MCF_SEC_SISRL                        (*(volatile uint32_t*)(&_MBAR[0x21014]))
-#define MCF_SEC_SICRH                        (*(volatile uint32_t*)(&_MBAR[0x21018]))
-#define MCF_SEC_SICRL                        (*(volatile uint32_t*)(&_MBAR[0x2101C]))
-#define MCF_SEC_SIDR                         (*(volatile uint32_t*)(&_MBAR[0x21020]))
-#define MCF_SEC_EUASRH                       (*(volatile uint32_t*)(&_MBAR[0x21028]))
-#define MCF_SEC_EUASRL                       (*(volatile uint32_t*)(&_MBAR[0x2102C]))
-#define MCF_SEC_SMCR                         (*(volatile uint32_t*)(&_MBAR[0x21030]))
-#define MCF_SEC_MEAR                         (*(volatile uint32_t*)(&_MBAR[0x21038]))
-#define MCF_SEC_CCCR0                        (*(volatile uint32_t*)(&_MBAR[0x2200C]))
-#define MCF_SEC_CCPSRH0                      (*(volatile uint32_t*)(&_MBAR[0x22010]))
-#define MCF_SEC_CCPSRL0                      (*(volatile uint32_t*)(&_MBAR[0x22014]))
-#define MCF_SEC_CDPR0                        (*(volatile uint32_t*)(&_MBAR[0x22044]))
-#define MCF_SEC_FR0                          (*(volatile uint32_t*)(&_MBAR[0x2204C]))
-#define MCF_SEC_CCCR1                        (*(volatile uint32_t*)(&_MBAR[0x2300C]))
-#define MCF_SEC_CCPSRH1                      (*(volatile uint32_t*)(&_MBAR[0x23010]))
-#define MCF_SEC_CCPSRL1                      (*(volatile uint32_t*)(&_MBAR[0x23014]))
-#define MCF_SEC_CDPR1                        (*(volatile uint32_t*)(&_MBAR[0x23044]))
-#define MCF_SEC_FR1                          (*(volatile uint32_t*)(&_MBAR[0x2304C]))
-#define MCF_SEC_AFRCR                        (*(volatile uint32_t*)(&_MBAR[0x28018]))
-#define MCF_SEC_AFSR                         (*(volatile uint32_t*)(&_MBAR[0x28028]))
-#define MCF_SEC_AFISR                        (*(volatile uint32_t*)(&_MBAR[0x28030]))
-#define MCF_SEC_AFIMR                        (*(volatile uint32_t*)(&_MBAR[0x28038]))
-#define MCF_SEC_DRCR                         (*(volatile uint32_t*)(&_MBAR[0x2A018]))
-#define MCF_SEC_DSR                          (*(volatile uint32_t*)(&_MBAR[0x2A028]))
-#define MCF_SEC_DISR                         (*(volatile uint32_t*)(&_MBAR[0x2A030]))
-#define MCF_SEC_DIMR                         (*(volatile uint32_t*)(&_MBAR[0x2A038]))
-#define MCF_SEC_MDRCR                        (*(volatile uint32_t*)(&_MBAR[0x2C018]))
-#define MCF_SEC_MDSR                         (*(volatile uint32_t*)(&_MBAR[0x2C028]))
-#define MCF_SEC_MDISR                        (*(volatile uint32_t*)(&_MBAR[0x2C030]))
-#define MCF_SEC_MDIMR                        (*(volatile uint32_t*)(&_MBAR[0x2C038]))
-#define MCF_SEC_RNGRCR                       (*(volatile uint32_t*)(&_MBAR[0x2E018]))
-#define MCF_SEC_RNGSR                        (*(volatile uint32_t*)(&_MBAR[0x2E028]))
-#define MCF_SEC_RNGISR                       (*(volatile uint32_t*)(&_MBAR[0x2E030]))
-#define MCF_SEC_RNGIMR                       (*(volatile uint32_t*)(&_MBAR[0x2E038]))
-#define MCF_SEC_AESRCR                       (*(volatile uint32_t*)(&_MBAR[0x32018]))
-#define MCF_SEC_AESSR                        (*(volatile uint32_t*)(&_MBAR[0x32028]))
-#define MCF_SEC_AESISR                       (*(volatile uint32_t*)(&_MBAR[0x32030]))
-#define MCF_SEC_AESIMR                       (*(volatile uint32_t*)(&_MBAR[0x32038]))
-#define MCF_SEC_CCCRn(x)                     (*(volatile uint32_t*)(&_MBAR[0x2200C + ((x)*0x1000)]))
-#define MCF_SEC_CCPSRHn(x)                   (*(volatile uint32_t*)(&_MBAR[0x22010 + ((x)*0x1000)]))
-#define MCF_SEC_CCPSRLn(x)                   (*(volatile uint32_t*)(&_MBAR[0x22014 + ((x)*0x1000)]))
-#define MCF_SEC_CDPRn(x)                     (*(volatile uint32_t*)(&_MBAR[0x22044 + ((x)*0x1000)]))
-#define MCF_SEC_FRn(x)                       (*(volatile uint32_t*)(&_MBAR[0x2204C + ((x)*0x1000)]))
-
-
-/* Bit definitions and macros for MCF_SEC_EUACRH */
-#define MCF_SEC_EUACRH_AFEU(x)               (((x)&0xF)<<0)
-#define MCF_SEC_EUACRH_AFFEU_NOASSIGN        (0)
-#define MCF_SEC_EUACRH_AFFEU_CHA0            (0x1)
-#define MCF_SEC_EUACRH_AFFEU_CHA1            (0x2)
-#define MCF_SEC_EUACRH_MDEU(x)               (((x)&0xF)<<0x8)
-#define MCF_SEC_EUACRH_MDEU_NOASSIGN         (0)
-#define MCF_SEC_EUACRH_MDEU_CHA0             (0x100)
-#define MCF_SEC_EUACRH_MDEU_CHA1             (0x200)
-#define MCF_SEC_EUACRH_RNG(x)                (((x)&0xF)<<0x18)
-#define MCF_SEC_EUACRH_RNG_NOASSIGN          (0)
-#define MCF_SEC_EUACRH_RNG_CHA0              (0x1000000)
-#define MCF_SEC_EUACRH_RNG_CHA1              (0x2000000)
-
-/* Bit definitions and macros for MCF_SEC_EUACRL */
-#define MCF_SEC_EUACRL_AESU(x)               (((x)&0xF)<<0x10)
-#define MCF_SEC_EUACRL_AESU_NOASSIGN         (0)
-#define MCF_SEC_EUACRL_AESU_CHA0             (0x10000)
-#define MCF_SEC_EUACRL_AESU_CHA1             (0x20000)
-#define MCF_SEC_EUACRL_DEU(x)                (((x)&0xF)<<0x18)
-
-/* Bit definitions and macros for MCF_SEC_SIMRH */
-#define MCF_SEC_SIMRH_AERR                   (0x8000000)
-#define MCF_SEC_SIMRH_CHA_0_DN               (0x10000000)
-#define MCF_SEC_SIMRH_CHA_0_ERR              (0x20000000)
-#define MCF_SEC_SIMRH_CHA_1_DN               (0x40000000)
-#define MCF_SEC_SIMRH_CHA_1_ERR              (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_SIMRL */
-#define MCF_SEC_SIMRL_TEA                    (0x40)
-#define MCF_SEC_SIMRL_DEU_DN                 (0x100)
-#define MCF_SEC_SIMRL_DEU_ERR                (0x200)
-#define MCF_SEC_SIMRL_AESU_DN                (0x1000)
-#define MCF_SEC_SIMRL_AESU_ERR               (0x2000)
-#define MCF_SEC_SIMRL_MDEU_DN                (0x10000)
-#define MCF_SEC_SIMRL_MDEU_ERR               (0x20000)
-#define MCF_SEC_SIMRL_AFEU_DN                (0x100000)
-#define MCF_SEC_SIMRL_AFEU_ERR               (0x200000)
-#define MCF_SEC_SIMRL_RNG_DN                 (0x1000000)
-#define MCF_SEC_SIMRL_RNG_ERR                (0x2000000)
-
-/* Bit definitions and macros for MCF_SEC_SISRH */
-#define MCF_SEC_SISRH_AERR                   (0x8000000)
-#define MCF_SEC_SISRH_CHA_0_DN               (0x10000000)
-#define MCF_SEC_SISRH_CHA_0_ERR              (0x20000000)
-#define MCF_SEC_SISRH_CHA_1_DN               (0x40000000)
-#define MCF_SEC_SISRH_CHA_1_ERR              (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_SISRL */
-#define MCF_SEC_SISRL_TEA                    (0x40)
-#define MCF_SEC_SISRL_DEU_DN                 (0x100)
-#define MCF_SEC_SISRL_DEU_ERR                (0x200)
-#define MCF_SEC_SISRL_AESU_DN                (0x1000)
-#define MCF_SEC_SISRL_AESU_ERR               (0x2000)
-#define MCF_SEC_SISRL_MDEU_DN                (0x10000)
-#define MCF_SEC_SISRL_MDEU_ERR               (0x20000)
-#define MCF_SEC_SISRL_AFEU_DN                (0x100000)
-#define MCF_SEC_SISRL_AFEU_ERR               (0x200000)
-#define MCF_SEC_SISRL_RNG_DN                 (0x1000000)
-#define MCF_SEC_SISRL_RNG_ERR                (0x2000000)
-
-/* Bit definitions and macros for MCF_SEC_SICRH */
-#define MCF_SEC_SICRH_AERR                   (0x8000000)
-#define MCF_SEC_SICRH_CHA_0_DN               (0x10000000)
-#define MCF_SEC_SICRH_CHA_0_ERR              (0x20000000)
-#define MCF_SEC_SICRH_CHA_1_DN               (0x40000000)
-#define MCF_SEC_SICRH_CHA_1_ERR              (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_SICRL */
-#define MCF_SEC_SICRL_TEA                    (0x40)
-#define MCF_SEC_SICRL_DEU_DN                 (0x100)
-#define MCF_SEC_SICRL_DEU_ERR                (0x200)
-#define MCF_SEC_SICRL_AESU_DN                (0x1000)
-#define MCF_SEC_SICRL_AESU_ERR               (0x2000)
-#define MCF_SEC_SICRL_MDEU_DN                (0x10000)
-#define MCF_SEC_SICRL_MDEU_ERR               (0x20000)
-#define MCF_SEC_SICRL_AFEU_DN                (0x100000)
-#define MCF_SEC_SICRL_AFEU_ERR               (0x200000)
-#define MCF_SEC_SICRL_RNG_DN                 (0x1000000)
-#define MCF_SEC_SICRL_RNG_ERR                (0x2000000)
-
-/* Bit definitions and macros for MCF_SEC_SIDR */
-#define MCF_SEC_SIDR_VERSION(x)              (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_SEC_EUASRH */
-#define MCF_SEC_EUASRH_AFEU(x)               (((x)&0xF)<<0)
-#define MCF_SEC_EUASRH_MDEU(x)               (((x)&0xF)<<0x8)
-#define MCF_SEC_EUASRH_RNG(x)                (((x)&0xF)<<0x18)
-
-/* Bit definitions and macros for MCF_SEC_EUASRL */
-#define MCF_SEC_EUASRL_AESU(x)               (((x)&0xF)<<0x10)
-#define MCF_SEC_EUASRL_DEU(x)                (((x)&0xF)<<0x18)
-
-/* Bit definitions and macros for MCF_SEC_SMCR */
-#define MCF_SEC_SMCR_CURR_CHAN(x)            (((x)&0xF)<<0x4)
-#define MCF_SEC_SMCR_CURR_CHAN_1             (0x10)
-#define MCF_SEC_SMCR_CURR_CHAN_2             (0x20)
-#define MCF_SEC_SMCR_SWR                     (0x1000000)
-
-/* Bit definitions and macros for MCF_SEC_MEAR */
-#define MCF_SEC_MEAR_ADDRESS(x)              (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_SEC_CCCRn */
-#define MCF_SEC_CCCRn_RST                    (0x1)
-#define MCF_SEC_CCCRn_CDIE                   (0x2)
-#define MCF_SEC_CCCRn_NT                     (0x4)
-#define MCF_SEC_CCCRn_NE                     (0x8)
-#define MCF_SEC_CCCRn_WE                     (0x10)
-#define MCF_SEC_CCCRn_BURST_SIZE(x)          (((x)&0x7)<<0x8)
-#define MCF_SEC_CCCRn_BURST_SIZE_2           (0)
-#define MCF_SEC_CCCRn_BURST_SIZE_8           (0x100)
-#define MCF_SEC_CCCRn_BURST_SIZE_16          (0x200)
-#define MCF_SEC_CCCRn_BURST_SIZE_24          (0x300)
-#define MCF_SEC_CCCRn_BURST_SIZE_32          (0x400)
-#define MCF_SEC_CCCRn_BURST_SIZE_40          (0x500)
-#define MCF_SEC_CCCRn_BURST_SIZE_48          (0x600)
-#define MCF_SEC_CCCRn_BURST_SIZE_56          (0x700)
-
-/* Bit definitions and macros for MCF_SEC_CCPSRHn */
-#define MCF_SEC_CCPSRHn_STATE(x)             (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_SEC_CCPSRLn */
-#define MCF_SEC_CCPSRLn_PAIR_PTR(x)          (((x)&0xFF)<<0)
-#define MCF_SEC_CCPSRLn_EUERR                (0x100)
-#define MCF_SEC_CCPSRLn_SERR                 (0x200)
-#define MCF_SEC_CCPSRLn_DERR                 (0x400)
-#define MCF_SEC_CCPSRLn_PERR                 (0x1000)
-#define MCF_SEC_CCPSRLn_TEA                  (0x2000)
-#define MCF_SEC_CCPSRLn_SD                   (0x10000)
-#define MCF_SEC_CCPSRLn_PD                   (0x20000)
-#define MCF_SEC_CCPSRLn_SRD                  (0x40000)
-#define MCF_SEC_CCPSRLn_PRD                  (0x80000)
-#define MCF_SEC_CCPSRLn_SG                   (0x100000)
-#define MCF_SEC_CCPSRLn_PG                   (0x200000)
-#define MCF_SEC_CCPSRLn_SR                   (0x400000)
-#define MCF_SEC_CCPSRLn_PR                   (0x800000)
-#define MCF_SEC_CCPSRLn_MO                   (0x1000000)
-#define MCF_SEC_CCPSRLn_MI                   (0x2000000)
-#define MCF_SEC_CCPSRLn_STAT                 (0x4000000)
-
-/* Bit definitions and macros for MCF_SEC_CDPRn */
-#define MCF_SEC_CDPRn_CDP(x)                 (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_SEC_FRn */
-#define MCF_SEC_FRn_FETCH_ADDR(x)            (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_SEC_AFRCR */
-#define MCF_SEC_AFRCR_SR                     (0x1000000)
-#define MCF_SEC_AFRCR_MI                     (0x2000000)
-#define MCF_SEC_AFRCR_RI                     (0x4000000)
-
-/* Bit definitions and macros for MCF_SEC_AFSR */
-#define MCF_SEC_AFSR_RD                      (0x1000000)
-#define MCF_SEC_AFSR_ID                      (0x2000000)
-#define MCF_SEC_AFSR_IE                      (0x4000000)
-#define MCF_SEC_AFSR_OFR                     (0x8000000)
-#define MCF_SEC_AFSR_IFW                     (0x10000000)
-#define MCF_SEC_AFSR_HALT                    (0x20000000)
-
-/* Bit definitions and macros for MCF_SEC_AFISR */
-#define MCF_SEC_AFISR_DSE                    (0x10000)
-#define MCF_SEC_AFISR_KSE                    (0x20000)
-#define MCF_SEC_AFISR_CE                     (0x40000)
-#define MCF_SEC_AFISR_ERE                    (0x80000)
-#define MCF_SEC_AFISR_IE                     (0x100000)
-#define MCF_SEC_AFISR_OFU                    (0x2000000)
-#define MCF_SEC_AFISR_IFO                    (0x4000000)
-#define MCF_SEC_AFISR_IFE                    (0x10000000)
-#define MCF_SEC_AFISR_OFE                    (0x20000000)
-#define MCF_SEC_AFISR_AE                     (0x40000000)
-#define MCF_SEC_AFISR_ME                     (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_AFIMR */
-#define MCF_SEC_AFIMR_DSE                    (0x10000)
-#define MCF_SEC_AFIMR_KSE                    (0x20000)
-#define MCF_SEC_AFIMR_CE                     (0x40000)
-#define MCF_SEC_AFIMR_ERE                    (0x80000)
-#define MCF_SEC_AFIMR_IE                     (0x100000)
-#define MCF_SEC_AFIMR_OFU                    (0x2000000)
-#define MCF_SEC_AFIMR_IFO                    (0x4000000)
-#define MCF_SEC_AFIMR_IFE                    (0x10000000)
-#define MCF_SEC_AFIMR_OFE                    (0x20000000)
-#define MCF_SEC_AFIMR_AE                     (0x40000000)
-#define MCF_SEC_AFIMR_ME                     (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_DRCR */
-#define MCF_SEC_DRCR_SR                      (0x1000000)
-#define MCF_SEC_DRCR_MI                      (0x2000000)
-#define MCF_SEC_DRCR_RI                      (0x4000000)
-
-/* Bit definitions and macros for MCF_SEC_DSR */
-#define MCF_SEC_DSR_RD                       (0x1000000)
-#define MCF_SEC_DSR_ID                       (0x2000000)
-#define MCF_SEC_DSR_IE                       (0x4000000)
-#define MCF_SEC_DSR_OFR                      (0x8000000)
-#define MCF_SEC_DSR_IFW                      (0x10000000)
-#define MCF_SEC_DSR_HALT                     (0x20000000)
-
-/* Bit definitions and macros for MCF_SEC_DISR */
-#define MCF_SEC_DISR_DSE                     (0x10000)
-#define MCF_SEC_DISR_KSE                     (0x20000)
-#define MCF_SEC_DISR_CE                      (0x40000)
-#define MCF_SEC_DISR_ERE                     (0x80000)
-#define MCF_SEC_DISR_IE                      (0x100000)
-#define MCF_SEC_DISR_KPE                     (0x200000)
-#define MCF_SEC_DISR_OFU                     (0x2000000)
-#define MCF_SEC_DISR_IFO                     (0x4000000)
-#define MCF_SEC_DISR_IFE                     (0x10000000)
-#define MCF_SEC_DISR_OFE                     (0x20000000)
-#define MCF_SEC_DISR_AE                      (0x40000000)
-#define MCF_SEC_DISR_ME                      (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_DIMR */
-#define MCF_SEC_DIMR_DSE                     (0x10000)
-#define MCF_SEC_DIMR_KSE                     (0x20000)
-#define MCF_SEC_DIMR_CE                      (0x40000)
-#define MCF_SEC_DIMR_ERE                     (0x80000)
-#define MCF_SEC_DIMR_IE                      (0x100000)
-#define MCF_SEC_DIMR_KPE                     (0x200000)
-#define MCF_SEC_DIMR_OFU                     (0x2000000)
-#define MCF_SEC_DIMR_IFO                     (0x4000000)
-#define MCF_SEC_DIMR_IFE                     (0x10000000)
-#define MCF_SEC_DIMR_OFE                     (0x20000000)
-#define MCF_SEC_DIMR_AE                      (0x40000000)
-#define MCF_SEC_DIMR_ME                      (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_MDRCR */
-#define MCF_SEC_MDRCR_SR                     (0x1000000)
-#define MCF_SEC_MDRCR_MI                     (0x2000000)
-#define MCF_SEC_MDRCR_RI                     (0x4000000)
-
-/* Bit definitions and macros for MCF_SEC_MDSR */
-#define MCF_SEC_MDSR_RD                      (0x1000000)
-#define MCF_SEC_MDSR_ID                      (0x2000000)
-#define MCF_SEC_MDSR_IE                      (0x4000000)
-#define MCF_SEC_MDSR_IFW                     (0x10000000)
-#define MCF_SEC_MDSR_HALT                    (0x20000000)
-
-/* Bit definitions and macros for MCF_SEC_MDISR */
-#define MCF_SEC_MDISR_DSE                    (0x10000)
-#define MCF_SEC_MDISR_KSE                    (0x20000)
-#define MCF_SEC_MDISR_CE                     (0x40000)
-#define MCF_SEC_MDISR_ERE                    (0x80000)
-#define MCF_SEC_MDISR_IE                     (0x100000)
-#define MCF_SEC_MDISR_IFO                    (0x4000000)
-#define MCF_SEC_MDISR_AE                     (0x40000000)
-#define MCF_SEC_MDISR_ME                     (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_MDIMR */
-#define MCF_SEC_MDIMR_DSE                    (0x10000)
-#define MCF_SEC_MDIMR_KSE                    (0x20000)
-#define MCF_SEC_MDIMR_CE                     (0x40000)
-#define MCF_SEC_MDIMR_ERE                    (0x80000)
-#define MCF_SEC_MDIMR_IE                     (0x100000)
-#define MCF_SEC_MDIMR_IFO                    (0x4000000)
-#define MCF_SEC_MDIMR_AE                     (0x40000000)
-#define MCF_SEC_MDIMR_ME                     (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_RNGRCR */
-#define MCF_SEC_RNGRCR_SR                    (0x1000000)
-#define MCF_SEC_RNGRCR_MI                    (0x2000000)
-#define MCF_SEC_RNGRCR_RI                    (0x4000000)
-
-/* Bit definitions and macros for MCF_SEC_RNGSR */
-#define MCF_SEC_RNGSR_RD                     (0x1000000)
-#define MCF_SEC_RNGSR_IE                     (0x4000000)
-#define MCF_SEC_RNGSR_OFR                    (0x8000000)
-#define MCF_SEC_RNGSR_HALT                   (0x20000000)
-
-/* Bit definitions and macros for MCF_SEC_RNGISR */
-#define MCF_SEC_RNGISR_IE                    (0x100000)
-#define MCF_SEC_RNGISR_OFU                   (0x2000000)
-#define MCF_SEC_RNGISR_AE                    (0x40000000)
-#define MCF_SEC_RNGISR_ME                    (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_RNGIMR */
-#define MCF_SEC_RNGIMR_IE                    (0x100000)
-#define MCF_SEC_RNGIMR_OFU                   (0x2000000)
-#define MCF_SEC_RNGIMR_AE                    (0x40000000)
-#define MCF_SEC_RNGIMR_ME                    (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_AESRCR */
-#define MCF_SEC_AESRCR_SR                    (0x1000000)
-#define MCF_SEC_AESRCR_MI                    (0x2000000)
-#define MCF_SEC_AESRCR_RI                    (0x4000000)
-
-/* Bit definitions and macros for MCF_SEC_AESSR */
-#define MCF_SEC_AESSR_RD                     (0x1000000)
-#define MCF_SEC_AESSR_ID                     (0x2000000)
-#define MCF_SEC_AESSR_IE                     (0x4000000)
-#define MCF_SEC_AESSR_OFR                    (0x8000000)
-#define MCF_SEC_AESSR_IFW                    (0x10000000)
-#define MCF_SEC_AESSR_HALT                   (0x20000000)
-
-/* Bit definitions and macros for MCF_SEC_AESISR */
-#define MCF_SEC_AESISR_DSE                   (0x10000)
-#define MCF_SEC_AESISR_KSE                   (0x20000)
-#define MCF_SEC_AESISR_CE                    (0x40000)
-#define MCF_SEC_AESISR_ERE                   (0x80000)
-#define MCF_SEC_AESISR_IE                    (0x100000)
-#define MCF_SEC_AESISR_OFU                   (0x2000000)
-#define MCF_SEC_AESISR_IFO                   (0x4000000)
-#define MCF_SEC_AESISR_IFE                   (0x10000000)
-#define MCF_SEC_AESISR_OFE                   (0x20000000)
-#define MCF_SEC_AESISR_AE                    (0x40000000)
-#define MCF_SEC_AESISR_ME                    (0x80000000)
-
-/* Bit definitions and macros for MCF_SEC_AESIMR */
-#define MCF_SEC_AESIMR_DSE                   (0x10000)
-#define MCF_SEC_AESIMR_KSE                   (0x20000)
-#define MCF_SEC_AESIMR_CE                    (0x40000)
-#define MCF_SEC_AESIMR_ERE                   (0x80000)
-#define MCF_SEC_AESIMR_IE                    (0x100000)
-#define MCF_SEC_AESIMR_OFU                   (0x2000000)
-#define MCF_SEC_AESIMR_IFO                   (0x4000000)
-#define MCF_SEC_AESIMR_IFE                   (0x10000000)
-#define MCF_SEC_AESIMR_OFE                   (0x20000000)
-#define MCF_SEC_AESIMR_AE                    (0x40000000)
-#define MCF_SEC_AESIMR_ME                    (0x80000000)
-
-
-#endif /* __MCF5475_SEC_H__ */
--- a/tos/jtagwait/include/MCF5475_SIU.h
+++ b/tos/jtagwait/include/MCF5475_SIU.h
@@ -1,67 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_SIU_H__
-#define __MCF5475_SIU_H__
-
-
-/*********************************************************************
-*
-* System Integration Unit (SIU)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_SIU_SBCR                         (*(volatile uint32_t*)(&_MBAR[0x10]))
-#define MCF_SIU_SECSACR                      (*(volatile uint32_t*)(&_MBAR[0x38]))
-#define MCF_SIU_RSR                          (*(volatile uint32_t*)(&_MBAR[0x44]))
-#define MCF_SIU_JTAGID                       (*(volatile uint32_t*)(&_MBAR[0x50]))
-
-
-/* Bit definitions and macros for MCF_SIU_SBCR */
-#define MCF_SIU_SBCR_PIN2DSPI                (0x8000000)
-#define MCF_SIU_SBCR_DMA2CPU                 (0x10000000)
-#define MCF_SIU_SBCR_CPU2DMA                 (0x20000000)
-#define MCF_SIU_SBCR_PIN2DMA                 (0x40000000)
-#define MCF_SIU_SBCR_PIN2CPU                 (0x80000000)
-
-/* Bit definitions and macros for MCF_SIU_SECSACR */
-#define MCF_SIU_SECSACR_SEQEN                (0x1)
-
-/* Bit definitions and macros for MCF_SIU_RSR */
-#define MCF_SIU_RSR_RST                      (0x1)
-#define MCF_SIU_RSR_RSTWD                    (0x2)
-#define MCF_SIU_RSR_RSTJTG                   (0x8)
-
-/* Bit definitions and macros for MCF_SIU_JTAGID */
-#define MCF_SIU_JTAGID_JTAGID(x)             (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_SIU_JTAGID */
-#define MCF_SIU_JTAGID_REV          (0xF0000000)
-#define MCF_SIU_JTAGID_PROCESSOR    (0x0FFFFFFF)
-#define MCF_SIU_JTAGID_MCF5485      (0x0800C01D)
-#define MCF_SIU_JTAGID_MCF5484      (0x0800D01D)
-#define MCF_SIU_JTAGID_MCF5483      (0x0800E01D)
-#define MCF_SIU_JTAGID_MCF5482      (0x0800F01D)
-#define MCF_SIU_JTAGID_MCF5481      (0x0801001D)
-#define MCF_SIU_JTAGID_MCF5480      (0x0801101D)
-#define MCF_SIU_JTAGID_MCF5475      (0x0801201D)
-#define MCF_SIU_JTAGID_MCF5474      (0x0801301D)
-#define MCF_SIU_JTAGID_MCF5473      (0x0801401D)
-#define MCF_SIU_JTAGID_MCF5472      (0x0801501D)
-#define MCF_SIU_JTAGID_MCF5471      (0x0801601D)
-#define MCF_SIU_JTAGID_MCF5470      (0x0801701D)
-
-#endif /* __MCF5475_SIU_H__ */
--- a/tos/jtagwait/include/MCF5475_SLT.h
+++ b/tos/jtagwait/include/MCF5475_SLT.h
@@ -1,59 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_SLT_H__
-#define __MCF5475_SLT_H__
-
-
-/*********************************************************************
-*
-* Slice Timers (SLT)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_SLT0_STCNT                       (*(volatile uint32_t*)(&_MBAR[0x900]))
-#define MCF_SLT0_SCR                         (*(volatile uint32_t*)(&_MBAR[0x904]))
-#define MCF_SLT0_SCNT                        (*(volatile uint32_t*)(&_MBAR[0x908]))
-#define MCF_SLT0_SSR                         (*(volatile uint32_t*)(&_MBAR[0x90C]))
-
-#define MCF_SLT1_STCNT                       (*(volatile uint32_t*)(&_MBAR[0x910]))
-#define MCF_SLT1_SCR                         (*(volatile uint32_t*)(&_MBAR[0x914]))
-#define MCF_SLT1_SCNT                        (*(volatile uint32_t*)(&_MBAR[0x918]))
-#define MCF_SLT1_SSR                         (*(volatile uint32_t*)(&_MBAR[0x91C]))
-
-#define MCF_SLT_STCNT(x)                     (*(volatile uint32_t*)(&_MBAR[0x900 + ((x)*0x10)]))
-#define MCF_SLT_SCR(x)                       (*(volatile uint32_t*)(&_MBAR[0x904 + ((x)*0x10)]))
-#define MCF_SLT_SCNT(x)                      (*(volatile int32_t*)(&_MBAR[0x908 + ((x)*0x10)]))
-#define MCF_SLT_SSR(x)                       (*(volatile uint32_t*)(&_MBAR[0x90C + ((x)*0x10)]))
-
-
-/* Bit definitions and macros for MCF_SLT_STCNT */
-#define MCF_SLT_STCNT_TC(x)                  (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_SLT_SCR */
-#define MCF_SLT_SCR_TEN                      (0x1000000)
-#define MCF_SLT_SCR_IEN                      (0x2000000)
-#define MCF_SLT_SCR_RUN                      (0x4000000)
-
-/* Bit definitions and macros for MCF_SLT_SCNT */
-#define MCF_SLT_SCNT_CNT(x)                  (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_SLT_SSR */
-#define MCF_SLT_SSR_ST                       (0x1000000)
-#define MCF_SLT_SSR_BE                       (0x2000000)
-
-
-#endif /* __MCF5475_SLT_H__ */
--- a/tos/jtagwait/include/MCF5475_SRAM.h
+++ b/tos/jtagwait/include/MCF5475_SRAM.h
@@ -1,62 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_SRAM_H__
-#define __MCF5475_SRAM_H__
-
-
-/*********************************************************************
-*
-* System SRAM Module (SRAM)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_SRAM_SSCR                        (*(volatile uint32_t*)(&__MBAR[0x1FFC0]))
-#define MCF_SRAM_TCCR                        (*(volatile uint32_t*)(&__MBAR[0x1FFC4]))
-#define MCF_SRAM_TCCRDR                      (*(volatile uint32_t*)(&__MBAR[0x1FFC8]))
-#define MCF_SRAM_TCCRDW                      (*(volatile uint32_t*)(&__MBAR[0x1FFCC]))
-#define MCF_SRAM_TCCRSEC                     (*(volatile uint32_t*)(&__MBAR[0x1FFD0]))
-
-
-/* Bit definitions and macros for MCF_SRAM_SSCR */
-#define MCF_SRAM_SSCR_INLV                   (0x10000)
-
-/* Bit definitions and macros for MCF_SRAM_TCCR */
-#define MCF_SRAM_TCCR_BANK0_TC(x)            (((x)&0xF)<<0)
-#define MCF_SRAM_TCCR_BANK1_TC(x)            (((x)&0xF)<<0x8)
-#define MCF_SRAM_TCCR_BANK2_TC(x)            (((x)&0xF)<<0x10)
-#define MCF_SRAM_TCCR_BANK3_TC(x)            (((x)&0xF)<<0x18)
-
-/* Bit definitions and macros for MCF_SRAM_TCCRDR */
-#define MCF_SRAM_TCCRDR_BANK0_TC(x)          (((x)&0xF)<<0)
-#define MCF_SRAM_TCCRDR_BANK1_TC(x)          (((x)&0xF)<<0x8)
-#define MCF_SRAM_TCCRDR_BANK2_TC(x)          (((x)&0xF)<<0x10)
-#define MCF_SRAM_TCCRDR_BANK3_TC(x)          (((x)&0xF)<<0x18)
-
-/* Bit definitions and macros for MCF_SRAM_TCCRDW */
-#define MCF_SRAM_TCCRDW_BANK0_TC(x)          (((x)&0xF)<<0)
-#define MCF_SRAM_TCCRDW_BANK1_TC(x)          (((x)&0xF)<<0x8)
-#define MCF_SRAM_TCCRDW_BANK2_TC(x)          (((x)&0xF)<<0x10)
-#define MCF_SRAM_TCCRDW_BANK3_TC(x)          (((x)&0xF)<<0x18)
-
-/* Bit definitions and macros for MCF_SRAM_TCCRSEC */
-#define MCF_SRAM_TCCRSEC_BANK0_TC(x)         (((x)&0xF)<<0)
-#define MCF_SRAM_TCCRSEC_BANK1_TC(x)         (((x)&0xF)<<0x8)
-#define MCF_SRAM_TCCRSEC_BANK2_TC(x)         (((x)&0xF)<<0x10)
-#define MCF_SRAM_TCCRSEC_BANK3_TC(x)         (((x)&0xF)<<0x18)
-
-
-#endif /* __MCF5475_SRAM_H__ */
--- a/tos/jtagwait/include/MCF5475_USB.h
+++ b/tos/jtagwait/include/MCF5475_USB.h
@@ -1,554 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_USB_H__
-#define __MCF5475_USB_H__
-
-
-/*********************************************************************
-*
-* Universal Serial Bus Interface (USB)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_USB_USBAISR                      (*(volatile uint8_t *)(&__MBAR[0xB000]))
-#define MCF_USB_USBAIMR                      (*(volatile uint8_t *)(&__MBAR[0xB001]))
-#define MCF_USB_EPINFO                       (*(volatile uint8_t *)(&__MBAR[0xB003]))
-#define MCF_USB_CFGR                         (*(volatile uint8_t *)(&__MBAR[0xB004]))
-#define MCF_USB_CFGAR                        (*(volatile uint8_t *)(&__MBAR[0xB005]))
-#define MCF_USB_SPEEDR                       (*(volatile uint8_t *)(&__MBAR[0xB006]))
-#define MCF_USB_FRMNUMR                      (*(volatile uint16_t*)(&__MBAR[0xB00E]))
-#define MCF_USB_EPTNR                        (*(volatile uint16_t*)(&__MBAR[0xB010]))
-#define MCF_USB_IFUR                         (*(volatile uint16_t*)(&__MBAR[0xB014]))
-#define MCF_USB_IFR0                         (*(volatile uint16_t*)(&__MBAR[0xB040]))
-#define MCF_USB_IFR1                         (*(volatile uint16_t*)(&__MBAR[0xB042]))
-#define MCF_USB_IFR2                         (*(volatile uint16_t*)(&__MBAR[0xB044]))
-#define MCF_USB_IFR3                         (*(volatile uint16_t*)(&__MBAR[0xB046]))
-#define MCF_USB_IFR4                         (*(volatile uint16_t*)(&__MBAR[0xB048]))
-#define MCF_USB_IFR5                         (*(volatile uint16_t*)(&__MBAR[0xB04A]))
-#define MCF_USB_IFR6                         (*(volatile uint16_t*)(&__MBAR[0xB04C]))
-#define MCF_USB_IFR7                         (*(volatile uint16_t*)(&__MBAR[0xB04E]))
-#define MCF_USB_IFR8                         (*(volatile uint16_t*)(&__MBAR[0xB050]))
-#define MCF_USB_IFR9                         (*(volatile uint16_t*)(&__MBAR[0xB052]))
-#define MCF_USB_IFR10                        (*(volatile uint16_t*)(&__MBAR[0xB054]))
-#define MCF_USB_IFR11                        (*(volatile uint16_t*)(&__MBAR[0xB056]))
-#define MCF_USB_IFR12                        (*(volatile uint16_t*)(&__MBAR[0xB058]))
-#define MCF_USB_IFR13                        (*(volatile uint16_t*)(&__MBAR[0xB05A]))
-#define MCF_USB_IFR14                        (*(volatile uint16_t*)(&__MBAR[0xB05C]))
-#define MCF_USB_IFR15                        (*(volatile uint16_t*)(&__MBAR[0xB05E]))
-#define MCF_USB_IFR16                        (*(volatile uint16_t*)(&__MBAR[0xB060]))
-#define MCF_USB_IFR17                        (*(volatile uint16_t*)(&__MBAR[0xB062]))
-#define MCF_USB_IFR18                        (*(volatile uint16_t*)(&__MBAR[0xB064]))
-#define MCF_USB_IFR19                        (*(volatile uint16_t*)(&__MBAR[0xB066]))
-#define MCF_USB_IFR20                        (*(volatile uint16_t*)(&__MBAR[0xB068]))
-#define MCF_USB_IFR21                        (*(volatile uint16_t*)(&__MBAR[0xB06A]))
-#define MCF_USB_IFR22                        (*(volatile uint16_t*)(&__MBAR[0xB06C]))
-#define MCF_USB_IFR23                        (*(volatile uint16_t*)(&__MBAR[0xB06E]))
-#define MCF_USB_IFR24                        (*(volatile uint16_t*)(&__MBAR[0xB070]))
-#define MCF_USB_IFR25                        (*(volatile uint16_t*)(&__MBAR[0xB072]))
-#define MCF_USB_IFR26                        (*(volatile uint16_t*)(&__MBAR[0xB074]))
-#define MCF_USB_IFR27                        (*(volatile uint16_t*)(&__MBAR[0xB076]))
-#define MCF_USB_IFR28                        (*(volatile uint16_t*)(&__MBAR[0xB078]))
-#define MCF_USB_IFR29                        (*(volatile uint16_t*)(&__MBAR[0xB07A]))
-#define MCF_USB_IFR30                        (*(volatile uint16_t*)(&__MBAR[0xB07C]))
-#define MCF_USB_IFR31                        (*(volatile uint16_t*)(&__MBAR[0xB07E]))
-#define MCF_USB_PPCNT                        (*(volatile uint16_t*)(&__MBAR[0xB080]))
-#define MCF_USB_DPCNT                        (*(volatile uint16_t*)(&__MBAR[0xB082]))
-#define MCF_USB_CRCECNT                      (*(volatile uint16_t*)(&__MBAR[0xB084]))
-#define MCF_USB_BSECNT                       (*(volatile uint16_t*)(&__MBAR[0xB086]))
-#define MCF_USB_PIDECNT                      (*(volatile uint16_t*)(&__MBAR[0xB088]))
-#define MCF_USB_FRMECNT                      (*(volatile uint16_t*)(&__MBAR[0xB08A]))
-#define MCF_USB_TXPCNT                       (*(volatile uint16_t*)(&__MBAR[0xB08C]))
-#define MCF_USB_CNTOVR                       (*(volatile uint8_t *)(&__MBAR[0xB08E]))
-#define MCF_USB_EP0ACR                       (*(volatile uint8_t *)(&__MBAR[0xB101]))
-#define MCF_USB_EP0MPSR                      (*(volatile uint16_t*)(&__MBAR[0xB102]))
-#define MCF_USB_EP0IFR                       (*(volatile uint8_t *)(&__MBAR[0xB104]))
-#define MCF_USB_EP0SR                        (*(volatile uint8_t *)(&__MBAR[0xB105]))
-#define MCF_USB_BMRTR                        (*(volatile uint8_t *)(&__MBAR[0xB106]))
-#define MCF_USB_BRTR                         (*(volatile uint8_t *)(&__MBAR[0xB107]))
-#define MCF_USB_WVALUER                      (*(volatile uint16_t*)(&__MBAR[0xB108]))
-#define MCF_USB_WINDEXR                      (*(volatile uint16_t*)(&__MBAR[0xB10A]))
-#define MCF_USB_WLENGTHR                     (*(volatile uint16_t*)(&__MBAR[0xB10C]))
-#define MCF_USB_EP1OUTACR                    (*(volatile uint8_t *)(&__MBAR[0xB131]))
-#define MCF_USB_EP1OUTMPSR                   (*(volatile uint16_t*)(&__MBAR[0xB132]))
-#define MCF_USB_EP1OUTIFR                    (*(volatile uint8_t *)(&__MBAR[0xB134]))
-#define MCF_USB_EP1OUTSR                     (*(volatile uint8_t *)(&__MBAR[0xB135]))
-#define MCF_USB_EP1OUTSFR                    (*(volatile uint16_t*)(&__MBAR[0xB13E]))
-#define MCF_USB_EP1INACR                     (*(volatile uint8_t *)(&__MBAR[0xB149]))
-#define MCF_USB_EP1INMPSR                    (*(volatile uint16_t*)(&__MBAR[0xB14A]))
-#define MCF_USB_EP1INIFR                     (*(volatile uint8_t *)(&__MBAR[0xB14C]))
-#define MCF_USB_EP1INSR                      (*(volatile uint8_t *)(&__MBAR[0xB14D]))
-#define MCF_USB_EP1INSFR                     (*(volatile uint16_t*)(&__MBAR[0xB156]))
-#define MCF_USB_EP2OUTACR                    (*(volatile uint8_t *)(&__MBAR[0xB161]))
-#define MCF_USB_EP2OUTMPSR                   (*(volatile uint16_t*)(&__MBAR[0xB162]))
-#define MCF_USB_EP2OUTIFR                    (*(volatile uint8_t *)(&__MBAR[0xB164]))
-#define MCF_USB_EP2OUTSR                     (*(volatile uint8_t *)(&__MBAR[0xB165]))
-#define MCF_USB_EP2OUTSFR                    (*(volatile uint16_t*)(&__MBAR[0xB16E]))
-#define MCF_USB_EP2INACR                     (*(volatile uint8_t *)(&__MBAR[0xB179]))
-#define MCF_USB_EP2INMPSR                    (*(volatile uint16_t*)(&__MBAR[0xB17A]))
-#define MCF_USB_EP2INIFR                     (*(volatile uint8_t *)(&__MBAR[0xB17C]))
-#define MCF_USB_EP2INSR                      (*(volatile uint8_t *)(&__MBAR[0xB17D]))
-#define MCF_USB_EP2INSFR                     (*(volatile uint16_t*)(&__MBAR[0xB186]))
-#define MCF_USB_EP3OUTACR                    (*(volatile uint8_t *)(&__MBAR[0xB191]))
-#define MCF_USB_EP3OUTMPSR                   (*(volatile uint16_t*)(&__MBAR[0xB192]))
-#define MCF_USB_EP3OUTIFR                    (*(volatile uint8_t *)(&__MBAR[0xB194]))
-#define MCF_USB_EP3OUTSR                     (*(volatile uint8_t *)(&__MBAR[0xB195]))
-#define MCF_USB_EP3OUTSFR                    (*(volatile uint16_t*)(&__MBAR[0xB19E]))
-#define MCF_USB_EP3INACR                     (*(volatile uint8_t *)(&__MBAR[0xB1A9]))
-#define MCF_USB_EP3INMPSR                    (*(volatile uint16_t*)(&__MBAR[0xB1AA]))
-#define MCF_USB_EP3INIFR                     (*(volatile uint8_t *)(&__MBAR[0xB1AC]))
-#define MCF_USB_EP3INSR                      (*(volatile uint8_t *)(&__MBAR[0xB1AD]))
-#define MCF_USB_EP3INSFR                     (*(volatile uint16_t*)(&__MBAR[0xB1B6]))
-#define MCF_USB_EP4OUTACR                    (*(volatile uint8_t *)(&__MBAR[0xB1C1]))
-#define MCF_USB_EP4OUTMPSR                   (*(volatile uint16_t*)(&__MBAR[0xB1C2]))
-#define MCF_USB_EP4OUTIFR                    (*(volatile uint8_t *)(&__MBAR[0xB1C4]))
-#define MCF_USB_EP4OUTSR                     (*(volatile uint8_t *)(&__MBAR[0xB1C5]))
-#define MCF_USB_EP4OUTSFR                    (*(volatile uint16_t*)(&__MBAR[0xB1CE]))
-#define MCF_USB_EP4INACR                     (*(volatile uint8_t *)(&__MBAR[0xB1D9]))
-#define MCF_USB_EP4INMPSR                    (*(volatile uint16_t*)(&__MBAR[0xB1DA]))
-#define MCF_USB_EP4INIFR                     (*(volatile uint8_t *)(&__MBAR[0xB1DC]))
-#define MCF_USB_EP4INSR                      (*(volatile uint8_t *)(&__MBAR[0xB1DD]))
-#define MCF_USB_EP4INSFR                     (*(volatile uint16_t*)(&__MBAR[0xB1E6]))
-#define MCF_USB_EP5OUTACR                    (*(volatile uint8_t *)(&__MBAR[0xB1F1]))
-#define MCF_USB_EP5OUTMPSR                   (*(volatile uint16_t*)(&__MBAR[0xB1F2]))
-#define MCF_USB_EP5OUTIFR                    (*(volatile uint8_t *)(&__MBAR[0xB1F4]))
-#define MCF_USB_EP5OUTSR                     (*(volatile uint8_t *)(&__MBAR[0xB1F5]))
-#define MCF_USB_EP5OUTSFR                    (*(volatile uint16_t*)(&__MBAR[0xB1FE]))
-#define MCF_USB_EP5INACR                     (*(volatile uint8_t *)(&__MBAR[0xB209]))
-#define MCF_USB_EP5INMPSR                    (*(volatile uint16_t*)(&__MBAR[0xB20A]))
-#define MCF_USB_EP5INIFR                     (*(volatile uint8_t *)(&__MBAR[0xB20C]))
-#define MCF_USB_EP5INSR                      (*(volatile uint8_t *)(&__MBAR[0xB20D]))
-#define MCF_USB_EP5INSFR                     (*(volatile uint16_t*)(&__MBAR[0xB216]))
-#define MCF_USB_EP6OUTACR                    (*(volatile uint8_t *)(&__MBAR[0xB221]))
-#define MCF_USB_EP6OUTMPSR                   (*(volatile uint16_t*)(&__MBAR[0xB222]))
-#define MCF_USB_EP6OUTIFR                    (*(volatile uint8_t *)(&__MBAR[0xB224]))
-#define MCF_USB_EP6OUTSR                     (*(volatile uint8_t *)(&__MBAR[0xB225]))
-#define MCF_USB_EP6OUTSFR                    (*(volatile uint16_t*)(&__MBAR[0xB22E]))
-#define MCF_USB_EP6INACR                     (*(volatile uint8_t *)(&__MBAR[0xB239]))
-#define MCF_USB_EP6INMPSR                    (*(volatile uint16_t*)(&__MBAR[0xB23A]))
-#define MCF_USB_EP6INIFR                     (*(volatile uint8_t *)(&__MBAR[0xB23C]))
-#define MCF_USB_EP6INSR                      (*(volatile uint8_t *)(&__MBAR[0xB23D]))
-#define MCF_USB_EP6INSFR                     (*(volatile uint16_t*)(&__MBAR[0xB246]))
-#define MCF_USB_USBSR                        (*(volatile uint32_t*)(&__MBAR[0xB400]))
-#define MCF_USB_USBCR                        (*(volatile uint32_t*)(&__MBAR[0xB404]))
-#define MCF_USB_DRAMCR                       (*(volatile uint32_t*)(&__MBAR[0xB408]))
-#define MCF_USB_DRAMDR                       (*(volatile uint32_t*)(&__MBAR[0xB40C]))
-#define MCF_USB_USBISR                       (*(volatile uint32_t*)(&__MBAR[0xB410]))
-#define MCF_USB_USBIMR                       (*(volatile uint32_t*)(&__MBAR[0xB414]))
-#define MCF_USB_EP0STAT                      (*(volatile uint32_t*)(&__MBAR[0xB440]))
-#define MCF_USB_EP0ISR                       (*(volatile uint32_t*)(&__MBAR[0xB444]))
-#define MCF_USB_EP0IMR                       (*(volatile uint32_t*)(&__MBAR[0xB448]))
-#define MCF_USB_EP0FRCFGR                    (*(volatile uint32_t*)(&__MBAR[0xB44C]))
-#define MCF_USB_EP0FDR                       (*(volatile uint32_t*)(&__MBAR[0xB450]))
-#define MCF_USB_EP0FSR                       (*(volatile uint32_t*)(&__MBAR[0xB454]))
-#define MCF_USB_EP0FCR                       (*(volatile uint32_t*)(&__MBAR[0xB458]))
-#define MCF_USB_EP0FAR                       (*(volatile uint32_t*)(&__MBAR[0xB45C]))
-#define MCF_USB_EP0FRP                       (*(volatile uint32_t*)(&__MBAR[0xB460]))
-#define MCF_USB_EP0FWP                       (*(volatile uint32_t*)(&__MBAR[0xB464]))
-#define MCF_USB_EP0LRFP                      (*(volatile uint32_t*)(&__MBAR[0xB468]))
-#define MCF_USB_EP0LWFP                      (*(volatile uint32_t*)(&__MBAR[0xB46C]))
-#define MCF_USB_EP1STAT                      (*(volatile uint32_t*)(&__MBAR[0xB470]))
-#define MCF_USB_EP1ISR                       (*(volatile uint32_t*)(&__MBAR[0xB474]))
-#define MCF_USB_EP1IMR                       (*(volatile uint32_t*)(&__MBAR[0xB478]))
-#define MCF_USB_EP1FRCFGR                    (*(volatile uint32_t*)(&__MBAR[0xB47C]))
-#define MCF_USB_EP1FDR                       (*(volatile uint32_t*)(&__MBAR[0xB480]))
-#define MCF_USB_EP1FSR                       (*(volatile uint32_t*)(&__MBAR[0xB484]))
-#define MCF_USB_EP1FCR                       (*(volatile uint32_t*)(&__MBAR[0xB488]))
-#define MCF_USB_EP1FAR                       (*(volatile uint32_t*)(&__MBAR[0xB48C]))
-#define MCF_USB_EP1FRP                       (*(volatile uint32_t*)(&__MBAR[0xB490]))
-#define MCF_USB_EP1FWP                       (*(volatile uint32_t*)(&__MBAR[0xB494]))
-#define MCF_USB_EP1LRFP                      (*(volatile uint32_t*)(&__MBAR[0xB498]))
-#define MCF_USB_EP1LWFP                      (*(volatile uint32_t*)(&__MBAR[0xB49C]))
-#define MCF_USB_EP2STAT                      (*(volatile uint32_t*)(&__MBAR[0xB4A0]))
-#define MCF_USB_EP2ISR                       (*(volatile uint32_t*)(&__MBAR[0xB4A4]))
-#define MCF_USB_EP2IMR                       (*(volatile uint32_t*)(&__MBAR[0xB4A8]))
-#define MCF_USB_EP2FRCFGR                    (*(volatile uint32_t*)(&__MBAR[0xB4AC]))
-#define MCF_USB_EP2FDR                       (*(volatile uint32_t*)(&__MBAR[0xB4B0]))
-#define MCF_USB_EP2FSR                       (*(volatile uint32_t*)(&__MBAR[0xB4B4]))
-#define MCF_USB_EP2FCR                       (*(volatile uint32_t*)(&__MBAR[0xB4B8]))
-#define MCF_USB_EP2FAR                       (*(volatile uint32_t*)(&__MBAR[0xB4BC]))
-#define MCF_USB_EP2FRP                       (*(volatile uint32_t*)(&__MBAR[0xB4C0]))
-#define MCF_USB_EP2FWP                       (*(volatile uint32_t*)(&__MBAR[0xB4C4]))
-#define MCF_USB_EP2LRFP                      (*(volatile uint32_t*)(&__MBAR[0xB4C8]))
-#define MCF_USB_EP2LWFP                      (*(volatile uint32_t*)(&__MBAR[0xB4CC]))
-#define MCF_USB_EP3STAT                      (*(volatile uint32_t*)(&__MBAR[0xB4D0]))
-#define MCF_USB_EP3ISR                       (*(volatile uint32_t*)(&__MBAR[0xB4D4]))
-#define MCF_USB_EP3IMR                       (*(volatile uint32_t*)(&__MBAR[0xB4D8]))
-#define MCF_USB_EP3FRCFGR                    (*(volatile uint32_t*)(&__MBAR[0xB4DC]))
-#define MCF_USB_EP3FDR                       (*(volatile uint32_t*)(&__MBAR[0xB4E0]))
-#define MCF_USB_EP3FSR                       (*(volatile uint32_t*)(&__MBAR[0xB4E4]))
-#define MCF_USB_EP3FCR                       (*(volatile uint32_t*)(&__MBAR[0xB4E8]))
-#define MCF_USB_EP3FAR                       (*(volatile uint32_t*)(&__MBAR[0xB4EC]))
-#define MCF_USB_EP3FRP                       (*(volatile uint32_t*)(&__MBAR[0xB4F0]))
-#define MCF_USB_EP3FWP                       (*(volatile uint32_t*)(&__MBAR[0xB4F4]))
-#define MCF_USB_EP3LRFP                      (*(volatile uint32_t*)(&__MBAR[0xB4F8]))
-#define MCF_USB_EP3LWFP                      (*(volatile uint32_t*)(&__MBAR[0xB4FC]))
-#define MCF_USB_EP4STAT                      (*(volatile uint32_t*)(&__MBAR[0xB500]))
-#define MCF_USB_EP4ISR                       (*(volatile uint32_t*)(&__MBAR[0xB504]))
-#define MCF_USB_EP4IMR                       (*(volatile uint32_t*)(&__MBAR[0xB508]))
-#define MCF_USB_EP4FRCFGR                    (*(volatile uint32_t*)(&__MBAR[0xB50C]))
-#define MCF_USB_EP4FDR                       (*(volatile uint32_t*)(&__MBAR[0xB510]))
-#define MCF_USB_EP4FSR                       (*(volatile uint32_t*)(&__MBAR[0xB514]))
-#define MCF_USB_EP4FCR                       (*(volatile uint32_t*)(&__MBAR[0xB518]))
-#define MCF_USB_EP4FAR                       (*(volatile uint32_t*)(&__MBAR[0xB51C]))
-#define MCF_USB_EP4FRP                       (*(volatile uint32_t*)(&__MBAR[0xB520]))
-#define MCF_USB_EP4FWP                       (*(volatile uint32_t*)(&__MBAR[0xB524]))
-#define MCF_USB_EP4LRFP                      (*(volatile uint32_t*)(&__MBAR[0xB528]))
-#define MCF_USB_EP4LWFP                      (*(volatile uint32_t*)(&__MBAR[0xB52C]))
-#define MCF_USB_EP5STAT                      (*(volatile uint32_t*)(&__MBAR[0xB530]))
-#define MCF_USB_EP5ISR                       (*(volatile uint32_t*)(&__MBAR[0xB534]))
-#define MCF_USB_EP5IMR                       (*(volatile uint32_t*)(&__MBAR[0xB538]))
-#define MCF_USB_EP5FRCFGR                    (*(volatile uint32_t*)(&__MBAR[0xB53C]))
-#define MCF_USB_EP5FDR                       (*(volatile uint32_t*)(&__MBAR[0xB540]))
-#define MCF_USB_EP5FSR                       (*(volatile uint32_t*)(&__MBAR[0xB544]))
-#define MCF_USB_EP5FCR                       (*(volatile uint32_t*)(&__MBAR[0xB548]))
-#define MCF_USB_EP5FAR                       (*(volatile uint32_t*)(&__MBAR[0xB54C]))
-#define MCF_USB_EP5FRP                       (*(volatile uint32_t*)(&__MBAR[0xB550]))
-#define MCF_USB_EP5FWP                       (*(volatile uint32_t*)(&__MBAR[0xB554]))
-#define MCF_USB_EP5LRFP                      (*(volatile uint32_t*)(&__MBAR[0xB558]))
-#define MCF_USB_EP5LWFP                      (*(volatile uint32_t*)(&__MBAR[0xB55C]))
-#define MCF_USB_EP6STAT                      (*(volatile uint32_t*)(&__MBAR[0xB560]))
-#define MCF_USB_EP6ISR                       (*(volatile uint32_t*)(&__MBAR[0xB564]))
-#define MCF_USB_EP6IMR                       (*(volatile uint32_t*)(&__MBAR[0xB568]))
-#define MCF_USB_EP6FRCFGR                    (*(volatile uint32_t*)(&__MBAR[0xB56C]))
-#define MCF_USB_EP6FDR                       (*(volatile uint32_t*)(&__MBAR[0xB570]))
-#define MCF_USB_EP6FSR                       (*(volatile uint32_t*)(&__MBAR[0xB574]))
-#define MCF_USB_EP6FCR                       (*(volatile uint32_t*)(&__MBAR[0xB578]))
-#define MCF_USB_EP6FAR                       (*(volatile uint32_t*)(&__MBAR[0xB57C]))
-#define MCF_USB_EP6FRP                       (*(volatile uint32_t*)(&__MBAR[0xB580]))
-#define MCF_USB_EP6FWP                       (*(volatile uint32_t*)(&__MBAR[0xB584]))
-#define MCF_USB_EP6LRFP                      (*(volatile uint32_t*)(&__MBAR[0xB588]))
-#define MCF_USB_EP6LWFP                      (*(volatile uint32_t*)(&__MBAR[0xB58C]))
-#define MCF_USB_IFR(x)                       (*(volatile uint16_t*)(&__MBAR[0xB040 + ((x)*0x2)]))
-#define MCF_USB_EPOUTACR(x)                  (*(volatile uint8_t *)(&__MBAR[0xB131 + ((x-1)*0x30)]))
-#define MCF_USB_EPOUTMPSR(x)                 (*(volatile uint16_t*)(&__MBAR[0xB132 + ((x-1)*0x30)]))
-#define MCF_USB_EPOUTIFR(x)                  (*(volatile uint8_t *)(&__MBAR[0xB134 + ((x-1)*0x30)]))
-#define MCF_USB_EPOUTSR(x)                   (*(volatile uint8_t *)(&__MBAR[0xB135 + ((x-1)*0x30)]))
-#define MCF_USB_EPOUTSFR(x)                  (*(volatile uint16_t*)(&__MBAR[0xB13E + ((x-1)*0x30)]))
-#define MCF_USB_EPINACR(x)                   (*(volatile uint8_t *)(&__MBAR[0xB149 + ((x-1)*0x30)]))
-#define MCF_USB_EPINMPSR(x)                  (*(volatile uint16_t*)(&__MBAR[0xB14A + ((x-1)*0x30)]))
-#define MCF_USB_EPINIFR(x)                   (*(volatile uint8_t *)(&__MBAR[0xB14C + ((x-1)*0x30)]))
-#define MCF_USB_EPINSR(x)                    (*(volatile uint8_t *)(&__MBAR[0xB14D + ((x-1)*0x30)]))
-#define MCF_USB_EPINSFR(x)                   (*(volatile uint16_t*)(&__MBAR[0xB156 + ((x-1)*0x30)]))
-#define MCF_USB_EPSTAT(x)                    (*(volatile uint32_t*)(&__MBAR[0xB440 + ((x)*0x30)]))
-#define MCF_USB_EPISR(x)                     (*(volatile uint32_t*)(&__MBAR[0xB444 + ((x)*0x30)]))
-#define MCF_USB_EPIMR(x)                     (*(volatile uint32_t*)(&__MBAR[0xB448 + ((x)*0x30)]))
-#define MCF_USB_EPFRCFGR(x)                  (*(volatile uint32_t*)(&__MBAR[0xB44C + ((x)*0x30)]))
-#define MCF_USB_EPFDR(x)                     (*(volatile uint32_t*)(&__MBAR[0xB450 + ((x)*0x30)]))
-#define MCF_USB_EPFSR(x)                     (*(volatile uint32_t*)(&__MBAR[0xB454 + ((x)*0x30)]))
-#define MCF_USB_EPFCR(x)                     (*(volatile uint32_t*)(&__MBAR[0xB458 + ((x)*0x30)]))
-#define MCF_USB_EPFAR(x)                     (*(volatile uint32_t*)(&__MBAR[0xB45C + ((x)*0x30)]))
-#define MCF_USB_EPFRP(x)                     (*(volatile uint32_t*)(&__MBAR[0xB460 + ((x)*0x30)]))
-#define MCF_USB_EPFWP(x)                     (*(volatile uint32_t*)(&__MBAR[0xB464 + ((x)*0x30)]))
-#define MCF_USB_EPLRFP(x)                    (*(volatile uint32_t*)(&__MBAR[0xB468 + ((x)*0x30)]))
-#define MCF_USB_EPLWFP(x)                    (*(volatile uint32_t*)(&__MBAR[0xB46C + ((x)*0x30)]))
-
-
-/* Bit definitions and macros for MCF_USB_USBAISR */
-#define MCF_USB_USBAISR_SETUP                (0x1)
-#define MCF_USB_USBAISR_IN                   (0x2)
-#define MCF_USB_USBAISR_OUT                  (0x4)
-#define MCF_USB_USBAISR_EPHALT               (0x8)
-#define MCF_USB_USBAISR_TRANSERR             (0x10)
-#define MCF_USB_USBAISR_ACK                  (0x20)
-#define MCF_USB_USBAISR_CTROVFL              (0x40)
-#define MCF_USB_USBAISR_EPSTALL              (0x80)
-
-/* Bit definitions and macros for MCF_USB_USBAIMR */
-#define MCF_USB_USBAIMR_SETUPEN              (0x1)
-#define MCF_USB_USBAIMR_INEN                 (0x2)
-#define MCF_USB_USBAIMR_OUTEN                (0x4)
-#define MCF_USB_USBAIMR_EPHALTEN             (0x8)
-#define MCF_USB_USBAIMR_TRANSERREN           (0x10)
-#define MCF_USB_USBAIMR_ACKEN                (0x20)
-#define MCF_USB_USBAIMR_CTROVFLEN            (0x40)
-#define MCF_USB_USBAIMR_EPSTALLEN            (0x80)
-
-/* Bit definitions and macros for MCF_USB_EPINFO */
-#define MCF_USB_EPINFO_EPDIR                 (0x1)
-#define MCF_USB_EPINFO_EPNUM(x)              (((x)&0x7)<<0x1)
-
-/* Bit definitions and macros for MCF_USB_CFGR */
-#define MCF_USB_CFGR_Configuration_Value(x)  (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_CFGAR */
-#define MCF_USB_CFGAR_RESERVED               (0xA0)
-#define MCF_USB_CFGAR_RMTWKEUP               (0xE0)
-
-/* Bit definitions and macros for MCF_USB_SPEEDR */
-#define MCF_USB_SPEEDR_SPEED(x)              (((x)&0x3)<<0)
-
-/* Bit definitions and macros for MCF_USB_FRMNUMR */
-#define MCF_USB_FRMNUMR_FRMNUM(x)            (((x)&0xFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_EPTNR */
-#define MCF_USB_EPTNR_EP1T(x)                (((x)&0x3)<<0)
-#define MCF_USB_EPTNR_EP2T(x)                (((x)&0x3)<<0x2)
-#define MCF_USB_EPTNR_EP3T(x)                (((x)&0x3)<<0x4)
-#define MCF_USB_EPTNR_EP4T(x)                (((x)&0x3)<<0x6)
-#define MCF_USB_EPTNR_EP5T(x)                (((x)&0x3)<<0x8)
-#define MCF_USB_EPTNR_EP6T(x)                (((x)&0x3)<<0xA)
-#define MCF_USB_EPTNR_EPnT1                  (0)
-#define MCF_USB_EPTNR_EPnT2                  (0x1)
-#define MCF_USB_EPTNR_EPnT3                  (0x2)
-
-/* Bit definitions and macros for MCF_USB_IFUR */
-#define MCF_USB_IFUR_ALTSET(x)               (((x)&0xFF)<<0)
-#define MCF_USB_IFUR_IFNUM(x)                (((x)&0xFF)<<0x8)
-
-/* Bit definitions and macros for MCF_USB_IFR */
-#define MCF_USB_IFR_ALTSET(x)                (((x)&0xFF)<<0)
-#define MCF_USB_IFR_IFNUM(x)                 (((x)&0xFF)<<0x8)
-
-/* Bit definitions and macros for MCF_USB_PPCNT */
-#define MCF_USB_PPCNT_PPCNT(x)               (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_DPCNT */
-#define MCF_USB_DPCNT_DPCNT(x)               (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_CRCECNT */
-#define MCF_USB_CRCECNT_CRCECNT(x)           (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_BSECNT */
-#define MCF_USB_BSECNT_BSECNT(x)             (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_PIDECNT */
-#define MCF_USB_PIDECNT_PIDECNT(x)           (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_FRMECNT */
-#define MCF_USB_FRMECNT_FRMECNT(x)           (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_TXPCNT */
-#define MCF_USB_TXPCNT_TXPCNT(x)             (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_CNTOVR */
-#define MCF_USB_CNTOVR_PPCNT                 (0x1)
-#define MCF_USB_CNTOVR_DPCNT                 (0x2)
-#define MCF_USB_CNTOVR_CRCECNT               (0x4)
-#define MCF_USB_CNTOVR_BSECNT                (0x8)
-#define MCF_USB_CNTOVR_PIDECNT               (0x10)
-#define MCF_USB_CNTOVR_FRMECNT               (0x20)
-#define MCF_USB_CNTOVR_TXPCNT                (0x40)
-
-/* Bit definitions and macros for MCF_USB_EP0ACR */
-#define MCF_USB_EP0ACR_TTYPE(x)              (((x)&0x3)<<0)
-#define MCF_USB_EP0ACR_TTYPE_CTRL            (0)
-#define MCF_USB_EP0ACR_TTYPE_ISOC            (0x1)
-#define MCF_USB_EP0ACR_TTYPE_BULK            (0x2)
-#define MCF_USB_EP0ACR_TTYPE_INT             (0x3)
-
-/* Bit definitions and macros for MCF_USB_EP0MPSR */
-#define MCF_USB_EP0MPSR_MAXPKTSZ(x)          (((x)&0x7FF)<<0)
-#define MCF_USB_EP0MPSR_ADDTRANS(x)          (((x)&0x3)<<0xB)
-
-/* Bit definitions and macros for MCF_USB_EP0IFR */
-#define MCF_USB_EP0IFR_IFNUM(x)              (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_EP0SR */
-#define MCF_USB_EP0SR_HALT                   (0x1)
-#define MCF_USB_EP0SR_ACTIVE                 (0x2)
-#define MCF_USB_EP0SR_PSTALL                 (0x4)
-#define MCF_USB_EP0SR_CCOMP                  (0x8)
-#define MCF_USB_EP0SR_TXZERO                 (0x20)
-#define MCF_USB_EP0SR_INT                    (0x80)
-
-/* Bit definitions and macros for MCF_USB_BMRTR */
-#define MCF_USB_BMRTR_REC(x)                 (((x)&0x1F)<<0)
-#define MCF_USB_BMRTR_REC_DEVICE             (0)
-#define MCF_USB_BMRTR_REC_INTERFACE          (0x1)
-#define MCF_USB_BMRTR_REC_ENDPOINT           (0x2)
-#define MCF_USB_BMRTR_REC_OTHER              (0x3)
-#define MCF_USB_BMRTR_TYPE(x)                (((x)&0x3)<<0x5)
-#define MCF_USB_BMRTR_TYPE_STANDARD          (0)
-#define MCF_USB_BMRTR_TYPE_CLASS             (0x20)
-#define MCF_USB_BMRTR_TYPE_VENDOR            (0x40)
-#define MCF_USB_BMRTR_DIR                    (0x80)
-
-/* Bit definitions and macros for MCF_USB_BRTR */
-#define MCF_USB_BRTR_BREQ(x)                 (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_WVALUER */
-#define MCF_USB_WVALUER_WVALUE(x)            (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_WINDEXR */
-#define MCF_USB_WINDEXR_WINDEX(x)            (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_WLENGTHR */
-#define MCF_USB_WLENGTHR_WLENGTH(x)          (((x)&0xFFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_EPOUTACR */
-#define MCF_USB_EPOUTACR_TTYPE(x)            (((x)&0x3)<<0)
-#define MCF_USB_EPOUTACR_TTYPE_ISOC          (0x1)
-#define MCF_USB_EPOUTACR_TTYPE_BULK          (0x2)
-#define MCF_USB_EPOUTACR_TTYPE_INT           (0x3)
-
-/* Bit definitions and macros for MCF_USB_EPOUTMPSR */
-#define MCF_USB_EPOUTMPSR_MAXPKTSZ(x)        (((x)&0x7FF)<<0)
-#define MCF_USB_EPOUTMPSR_ADDTRANS(x)        (((x)&0x3)<<0xB)
-
-/* Bit definitions and macros for MCF_USB_EPOUTIFR */
-#define MCF_USB_EPOUTIFR_IFNUM(x)            (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_EPOUTSR */
-#define MCF_USB_EPOUTSR_HALT                 (0x1)
-#define MCF_USB_EPOUTSR_ACTIVE               (0x2)
-#define MCF_USB_EPOUTSR_PSTALL               (0x4)
-#define MCF_USB_EPOUTSR_CCOMP                (0x8)
-#define MCF_USB_EPOUTSR_TXZERO               (0x20)
-#define MCF_USB_EPOUTSR_INT                  (0x80)
-
-/* Bit definitions and macros for MCF_USB_EPOUTSFR */
-#define MCF_USB_EPOUTSFR_FRMNUM(x)           (((x)&0x7FF)<<0)
-
-/* Bit definitions and macros for MCF_USB_EPINACR */
-#define MCF_USB_EPINACR_TTYPE(x)             (((x)&0x3)<<0)
-#define MCF_USB_EPINACR_TTYPE_ISOC           (0x1)
-#define MCF_USB_EPINACR_TTYPE_BULK           (0x2)
-#define MCF_USB_EPINACR_TTYPE_INT            (0x3)
-
-/* Bit definitions and macros for MCF_USB_EPINMPSR */
-#define MCF_USB_EPINMPSR_MAXPKTSZ(x)         (((x)&0x7FF)<<0)
-#define MCF_USB_EPINMPSR_ADDTRANS(x)         (((x)&0x3)<<0xB)
-
-/* Bit definitions and macros for MCF_USB_EPINIFR */
-#define MCF_USB_EPINIFR_IFNUM(x)             (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_EPINSR */
-#define MCF_USB_EPINSR_HALT                  (0x1)
-#define MCF_USB_EPINSR_ACTIVE                (0x2)
-#define MCF_USB_EPINSR_PSTALL                (0x4)
-#define MCF_USB_EPINSR_CCOMP                 (0x8)
-#define MCF_USB_EPINSR_TXZERO                (0x20)
-#define MCF_USB_EPINSR_INT                   (0x80)
-
-/* Bit definitions and macros for MCF_USB_EPINSFR */
-#define MCF_USB_EPINSFR_FRMNUM(x)            (((x)&0x7FF)<<0)
-
-/* Bit definitions and macros for MCF_USB_USBSR */
-#define MCF_USB_USBSR_ISOERREP(x)            (((x)&0xF)<<0)
-#define MCF_USB_USBSR_SUSP                   (0x80)
-
-/* Bit definitions and macros for MCF_USB_USBCR */
-#define MCF_USB_USBCR_RESUME                 (0x1)
-#define MCF_USB_USBCR_APPLOCK                (0x2)
-#define MCF_USB_USBCR_RST                    (0x4)
-#define MCF_USB_USBCR_RAMEN                  (0x8)
-#define MCF_USB_USBCR_RAMSPLIT               (0x20)
-
-/* Bit definitions and macros for MCF_USB_DRAMCR */
-#define MCF_USB_DRAMCR_DADR(x)               (((x)&0x3FF)<<0)
-#define MCF_USB_DRAMCR_DSIZE(x)              (((x)&0x7FF)<<0x10)
-#define MCF_USB_DRAMCR_BSY                   (0x40000000)
-#define MCF_USB_DRAMCR_START                 (0x80000000)
-
-/* Bit definitions and macros for MCF_USB_DRAMDR */
-#define MCF_USB_DRAMDR_DDAT(x)               (((x)&0xFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_USBISR */
-#define MCF_USB_USBISR_ISOERR                (0x1)
-#define MCF_USB_USBISR_FTUNLCK               (0x2)
-#define MCF_USB_USBISR_SUSP                  (0x4)
-#define MCF_USB_USBISR_RES                   (0x8)
-#define MCF_USB_USBISR_UPDSOF                (0x10)
-#define MCF_USB_USBISR_RSTSTOP               (0x20)
-#define MCF_USB_USBISR_SOF                   (0x40)
-#define MCF_USB_USBISR_MSOF                  (0x80)
-
-/* Bit definitions and macros for MCF_USB_USBIMR */
-#define MCF_USB_USBIMR_ISOERR                (0x1)
-#define MCF_USB_USBIMR_FTUNLCK               (0x2)
-#define MCF_USB_USBIMR_SUSP                  (0x4)
-#define MCF_USB_USBIMR_RES                   (0x8)
-#define MCF_USB_USBIMR_UPDSOF                (0x10)
-#define MCF_USB_USBIMR_RSTSTOP               (0x20)
-#define MCF_USB_USBIMR_SOF                   (0x40)
-#define MCF_USB_USBIMR_MSOF                  (0x80)
-
-/* Bit definitions and macros for MCF_USB_EPSTAT */
-#define MCF_USB_EPSTAT_RST                   (0x1)
-#define MCF_USB_EPSTAT_FLUSH                 (0x2)
-#define MCF_USB_EPSTAT_DIR                   (0x80)
-#define MCF_USB_EPSTAT_BYTECNT(x)            (((x)&0xFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_USB_EPISR */
-#define MCF_USB_EPISR_EOF                    (0x1)
-#define MCF_USB_EPISR_EOT                    (0x4)
-#define MCF_USB_EPISR_FIFOLO                 (0x10)
-#define MCF_USB_EPISR_FIFOHI                 (0x20)
-#define MCF_USB_EPISR_ERR                    (0x40)
-#define MCF_USB_EPISR_EMT                    (0x80)
-#define MCF_USB_EPISR_FU                     (0x100)
-
-/* Bit definitions and macros for MCF_USB_EPIMR */
-#define MCF_USB_EPIMR_EOF                    (0x1)
-#define MCF_USB_EPIMR_EOT                    (0x4)
-#define MCF_USB_EPIMR_FIFOLO                 (0x10)
-#define MCF_USB_EPIMR_FIFOHI                 (0x20)
-#define MCF_USB_EPIMR_ERR                    (0x40)
-#define MCF_USB_EPIMR_EMT                    (0x80)
-#define MCF_USB_EPIMR_FU                     (0x100)
-
-/* Bit definitions and macros for MCF_USB_EPFRCFGR */
-#define MCF_USB_EPFRCFGR_DEPTH(x)            (((x)&0x1FFF)<<0)
-#define MCF_USB_EPFRCFGR_BASE(x)             (((x)&0xFFF)<<0x10)
-
-/* Bit definitions and macros for MCF_USB_EPFDR */
-#define MCF_USB_EPFDR_RX_TXDATA(x)           (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_EPFSR */
-#define MCF_USB_EPFSR_EMT                    (0x10000)
-#define MCF_USB_EPFSR_ALRM                   (0x20000)
-#define MCF_USB_EPFSR_FU                     (0x40000)
-#define MCF_USB_EPFSR_FR                     (0x80000)
-#define MCF_USB_EPFSR_OF                     (0x100000)
-#define MCF_USB_EPFSR_UF                     (0x200000)
-#define MCF_USB_EPFSR_RXW                    (0x400000)
-#define MCF_USB_EPFSR_FAE                    (0x800000)
-#define MCF_USB_EPFSR_FRM(x)                 (((x)&0xF)<<0x18)
-#define MCF_USB_EPFSR_TXW                    (0x40000000)
-#define MCF_USB_EPFSR_IP                     (0x80000000)
-
-/* Bit definitions and macros for MCF_USB_EPFCR */
-#define MCF_USB_EPFCR_COUNTER(x)             (((x)&0xFFFF)<<0)
-#define MCF_USB_EPFCR_TXWMSK                 (0x40000)
-#define MCF_USB_EPFCR_OFMSK                  (0x80000)
-#define MCF_USB_EPFCR_UFMSK                  (0x100000)
-#define MCF_USB_EPFCR_RXWMSK                 (0x200000)
-#define MCF_USB_EPFCR_FAEMSK                 (0x400000)
-#define MCF_USB_EPFCR_IPMSK                  (0x800000)
-#define MCF_USB_EPFCR_GR(x)                  (((x)&0x7)<<0x18)
-#define MCF_USB_EPFCR_FRM                    (0x8000000)
-#define MCF_USB_EPFCR_TMR                    (0x10000000)
-#define MCF_USB_EPFCR_WFR                    (0x20000000)
-#define MCF_USB_EPFCR_SHAD                   (0x80000000)
-
-/* Bit definitions and macros for MCF_USB_EPFAR */
-#define MCF_USB_EPFAR_ALRMP(x)               (((x)&0xFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_EPFRP */
-#define MCF_USB_EPFRP_RP(x)                  (((x)&0xFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_EPFWP */
-#define MCF_USB_EPFWP_WP(x)                  (((x)&0xFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_EPLRFP */
-#define MCF_USB_EPLRFP_LRFP(x)               (((x)&0xFFF)<<0)
-
-/* Bit definitions and macros for MCF_USB_EPLWFP */
-#define MCF_USB_EPLWFP_LWFP(x)               (((x)&0xFFF)<<0)
-
-
-#endif /* __MCF5475_USB_H__ */
--- a/tos/jtagwait/include/MCF5475_XLB.h
+++ b/tos/jtagwait/include/MCF5475_XLB.h
@@ -1,101 +0,0 @@
-/* Coldfire C Header File
- * Copyright Freescale Semiconductor Inc
- * All rights reserved.
- *
- * 2008/05/23 Revision: 0.81
- *
- * (c) Copyright UNIS, a.s. 1997-2008
- * UNIS, a.s.
- * Jundrovska 33
- * 624 00 Brno
- * Czech Republic
- * http      : www.processorexpert.com
- * mail      : info@processorexpert.com
- */
-
-#ifndef __MCF5475_XLB_H__
-#define __MCF5475_XLB_H__
-
-
-/*********************************************************************
-*
-* XL Bus Arbiter (XLB)
-*
-*********************************************************************/
-
-/* Register read/write macros */
-#define MCF_XLB_XARB_CFG                     (*(volatile uint32_t*)(&_MBAR[0x240]))
-#define MCF_XLB_XARB_VER                     (*(volatile uint32_t*)(&_MBAR[0x244]))
-#define MCF_XLB_XARB_SR                      (*(volatile uint32_t*)(&_MBAR[0x248]))
-#define MCF_XLB_XARB_IMR                     (*(volatile uint32_t*)(&_MBAR[0x24C]))
-#define MCF_XLB_XARB_ADRCAP                  (*(volatile uint32_t*)(&_MBAR[0x250]))
-#define MCF_XLB_XARB_SIGCAP                  (*(volatile uint32_t*)(&_MBAR[0x254]))
-#define MCF_XLB_XARB_ADRTO                   (*(volatile uint32_t*)(&_MBAR[0x258]))
-#define MCF_XLB_XARB_DATTO                   (*(volatile uint32_t*)(&_MBAR[0x25C]))
-#define MCF_XLB_XARB_BUSTO                   (*(volatile uint32_t*)(&_MBAR[0x260]))
-#define MCF_XLB_XARB_PRIEN                   (*(volatile uint32_t*)(&_MBAR[0x264]))
-#define MCF_XLB_XARB_PRI                     (*(volatile uint32_t*)(&_MBAR[0x268]))
-
-
-/* Bit definitions and macros for MCF_XLB_XARB_CFG */
-#define MCF_XLB_XARB_CFG_AT                  (0x2)
-#define MCF_XLB_XARB_CFG_DT                  (0x4)
-#define MCF_XLB_XARB_CFG_BA                  (0x8)
-#define MCF_XLB_XARB_CFG_PM(x)               (((x)&0x3)<<0x5)
-#define MCF_XLB_XARB_CFG_SP(x)               (((x)&0x7)<<0x8)
-#define MCF_XLB_XARB_CFG_PLDIS               (0x80000000)
-
-/* Bit definitions and macros for MCF_XLB_XARB_VER */
-#define MCF_XLB_XARB_VER_VER(x)              (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_XLB_XARB_SR */
-#define MCF_XLB_XARB_SR_AT                   (0x1)
-#define MCF_XLB_XARB_SR_DT                   (0x2)
-#define MCF_XLB_XARB_SR_BA                   (0x4)
-#define MCF_XLB_XARB_SR_TTM                  (0x8)
-#define MCF_XLB_XARB_SR_ECW                  (0x10)
-#define MCF_XLB_XARB_SR_TTR                  (0x20)
-#define MCF_XLB_XARB_SR_TTA                  (0x40)
-#define MCF_XLB_XARB_SR_MM                   (0x80)
-#define MCF_XLB_XARB_SR_SEA                  (0x100)
-
-/* Bit definitions and macros for MCF_XLB_XARB_IMR */
-#define MCF_XLB_XARB_IMR_ATE                 (0x1)
-#define MCF_XLB_XARB_IMR_DTE                 (0x2)
-#define MCF_XLB_XARB_IMR_BAE                 (0x4)
-#define MCF_XLB_XARB_IMR_TTME                (0x8)
-#define MCF_XLB_XARB_IMR_ECWE                (0x10)
-#define MCF_XLB_XARB_IMR_TTRE                (0x20)
-#define MCF_XLB_XARB_IMR_TTAE                (0x40)
-#define MCF_XLB_XARB_IMR_MME                 (0x80)
-#define MCF_XLB_XARB_IMR_SEAE                (0x100)
-
-/* Bit definitions and macros for MCF_XLB_XARB_ADRCAP */
-#define MCF_XLB_XARB_ADRCAP_ADRCAP(x)        (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_XLB_XARB_SIGCAP */
-#define MCF_XLB_XARB_SIGCAP_TT(x)            (((x)&0x1F)<<0)
-#define MCF_XLB_XARB_SIGCAP_TBST             (0x20)
-#define MCF_XLB_XARB_SIGCAP_TSIZ(x)          (((x)&0x7)<<0x7)
-
-/* Bit definitions and macros for MCF_XLB_XARB_ADRTO */
-#define MCF_XLB_XARB_ADRTO_ADRTO(x)          (((x)&0xFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_XLB_XARB_DATTO */
-#define MCF_XLB_XARB_DATTO_DATTO(x)          (((x)&0xFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_XLB_XARB_BUSTO */
-#define MCF_XLB_XARB_BUSTO_BUSTO(x)          (((x)&0xFFFFFFFF)<<0)
-
-/* Bit definitions and macros for MCF_XLB_XARB_PRIEN */
-#define MCF_XLB_XARB_PRIEN_M0                (0x1)
-#define MCF_XLB_XARB_PRIEN_M2                (0x4)
-#define MCF_XLB_XARB_PRIEN_M3                (0x8)
-
-/* Bit definitions and macros for MCF_XLB_XARB_PRI */
-#define MCF_XLB_XARB_PRI_M0P(x)              (((x)&0x7)<<0)
-#define MCF_XLB_XARB_PRI_M2P(x)              (((x)&0x7)<<0x8)
-#define MCF_XLB_XARB_PRI_M3P(x)              (((x)&0x7)<<0xC)
-
-
-#endif /* __MCF5475_XLB_H__ */
--- a/tos/jtagwait/include/bas_printf.h
+++ b/tos/jtagwait/include/bas_printf.h
@@ -1,35 +0,0 @@
-/*
- *
- * This file is part of BaS_gcc.
- *
- * BaS_gcc 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.
- *
- * BaS_gcc 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 BaS_gcc.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef _BAS_PRINTF_H_
-#define _BAS_PRINTF_H_
-#include <stdarg.h>
-#include <stddef.h>
-
-extern void xvsnprintf(char *str, size_t size, const char *fmt, va_list va);
-extern void xvprintf(const char *fmt, va_list va);
-extern void xprintf(const char *fmt, ...);
-extern void xsnprintf(char *str, size_t size, const char *fmt, ...);
-extern void xputchar(int c);
-extern int sprintf(char *str, const char *format, ...);
-
-
-extern void display_progress(void);
-extern void hexdump(uint8_t buffer[], int size);
-#endif /* _BAS_PRINTF_H_ */
--- a/Show More
+++ b/Show More