- changed register defines to UPPER-CASE

Committed on the Free edition of March Hare Software CVSNT Server.
Upgrade to CVS Suite for more features and support:
http://march-hare.com/cvsnt/


git-svn-id: http://moon:8086/svn/vhdl/trunk@654 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
2009-11-09 20:36:16 +00:00
parent 576357a4d4
commit 593390a93d
3 changed files with 29 additions and 29 deletions
@@ -230,15 +230,15 @@ int main(int argc, char *argv[])
flash_img_hdr_t *pImg_hdr;
UINT32 img_size, block_sel;
volatile UINT32 *pReg = (UINT32*)sys_led_port;
volatile UINT32 *pBtn = (UINT32*)sys_gpio0;
volatile UINT32 *pDip = (UINT32*)sys_gpio1;
volatile UINT32 *pReg = (UINT32*)SYS_LED_PORT;
volatile UINT32 *pBtn = (UINT32*)SYS_GPIO0;
volatile UINT32 *pDip = (UINT32*)SYS_GPIO1;
volatile UINT8 *pMem;
volatile UINT32 *pROM32;
volatile UINT32 *pMem32;
volatile UINT32 *pFlashIO = (UINT32*)sys_flash_io; // Flash in uncached area
volatile UINT32 *pFlashMem = (UINT32*)sys_flash_mem; // Flash in cached area
volatile UINT32 *pUSB = (UINT32*)sys_usb_data;
volatile UINT32 *pFlashIO = (UINT32*)SYS_FLASH_IO; // Flash in uncached area
volatile UINT32 *pFlashMem = (UINT32*)SYS_FLASH_MEM; // Flash in cached area
volatile UINT32 *pUSB = (UINT32*)SYS_USB_DATA;
volatile UINT8 *ram8 = (UINT8*)SDRAM_BASE;
volatile UINT16 *ram16 = (UINT16*)SDRAM_BASE;
@@ -250,7 +250,7 @@ int main(int argc, char *argv[])
block_sel = 0x7F & (UINT32)*pDip;
// ----------------------------------------------------------
if (IS_ERROR(flash_find(&flash, sys_flash_io)))
if (IS_ERROR(flash_find(&flash, SYS_FLASH_IO)))
{
sputs("Cannot find flash device. Exit now!\n\n");
return 1;
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
flash_offset = flash_get_offset_by_blocknum(&flash, block_sel);
ram32 = (UINT32*)(SDRAM_BASE);
pFlashIO = (UINT32*)(sys_flash_io + flash_offset);
pFlashIO = (UINT32*)(SYS_FLASH_IO + flash_offset);
if (!(*pBtn & 8))
{
@@ -280,8 +280,8 @@ int main(int argc, char *argv[])
// It's safe to use cached Flash,
// because D-Cache was invalidated during execution of start code
// pFlashIO = (UINT32*)(sys_flash_io + pImg_hdr->img_base);
pFlashMem = (UINT32*)(sys_flash_mem + pImg_hdr->img_base);
// pFlashIO = (UINT32*)(SYS_FLASH_IO + pImg_hdr->img_base);
pFlashMem = (UINT32*)(SYS_FLASH_MEM + pImg_hdr->img_base);
for (i=0; i < img_size/4; i++)
// ram32[i] = pFlashIO[i];