diff options
Diffstat (limited to 'sys/arch/loongson/dev/bonitoreg.h')
| -rw-r--r-- | sys/arch/loongson/dev/bonitoreg.h | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/sys/arch/loongson/dev/bonitoreg.h b/sys/arch/loongson/dev/bonitoreg.h index c0ea9a43ff0..d542523f9d5 100644 --- a/sys/arch/loongson/dev/bonitoreg.h +++ b/sys/arch/loongson/dev/bonitoreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bonitoreg.h,v 1.5 2010/02/23 20:41:33 miod Exp $ */ +/* $OpenBSD: bonitoreg.h,v 1.6 2010/02/28 21:35:41 miod Exp $ */ /* $NetBSD: bonitoreg.h,v 1.6 2005/12/24 20:07:19 perry Exp $ */ /* @@ -34,35 +34,35 @@ #define REGVAL(x) *((volatile u_int32_t *)PHYS_TO_XKPHYS(x, CCA_NC)) -#define BONITO_FLASH_BASE 0x1c000000 -#define BONITO_FLASH_SIZE 0x02000000 +#define BONITO_FLASH_BASE 0x1c000000UL +#define BONITO_FLASH_SIZE 0x02000000UL #define BONITO_FLASH_TOP (BONITO_FLASH_BASE+BONITO_FLASH_SIZE-1) -#define BONITO_BOOT_BASE 0x1fc00000 -#define BONITO_BOOT_SIZE 0x00100000 +#define BONITO_BOOT_BASE 0x1fc00000UL +#define BONITO_BOOT_SIZE 0x00100000UL #define BONITO_BOOT_TOP (BONITO_BOOT_BASE+BONITO_BOOT_SIZE-1) -#define BONITO_REG_BASE 0x1fe00000 -#define BONITO_REG_SIZE 0x00040000 +#define BONITO_REG_BASE 0x1fe00000UL +#define BONITO_REG_SIZE 0x00040000UL #define BONITO_REG_TOP (BONITO_REG_BASE+BONITO_REG_SIZE-1) -#define BONITO_PCILO_BASE 0x10000000 -#define BONITO_PCILO_SIZE 0x0c000000 +#define BONITO_PCILO_BASE 0x10000000UL +#define BONITO_PCILO_SIZE 0x0c000000UL #define BONITO_PCILO_TOP (BONITO_PCILO_BASE+BONITO_PCILO_SIZE-1) -#define BONITO_PCILO0_BASE 0x10000000 -#define BONITO_PCILO1_BASE 0x14000000 -#define BONITO_PCILO2_BASE 0x18000000 -#define BONITO_PCIHI_BASE 0x20000000 -#define BONITO_PCIHI_SIZE 0x20000000 +#define BONITO_PCILO0_BASE 0x10000000UL +#define BONITO_PCILO1_BASE 0x14000000UL +#define BONITO_PCILO2_BASE 0x18000000UL +#define BONITO_PCIHI_BASE 0x20000000UL +#define BONITO_PCIHI_SIZE 0x60000000UL #define BONITO_PCIHI_TOP (BONITO_PCIHI_BASE+BONITO_PCIHI_SIZE-1) -#define LS2F_PCIHI_BASE 0x40000000 -#define LS2F_PCIHI_SIZE 0x40000000 +#define LS2F_PCIHI_BASE 0x40000000UL +#define LS2F_PCIHI_SIZE 0x40000000UL #define LS2F_PCIHI_TOP (LS2F_PCIHI_BASE+LS2F_PCIHI_SIZE-1) -#define BONITO_PCIIO_BASE 0x1fd00000 -#define BONITO_PCIIO_LEGACY 0x00004000 -#define BONITO_PCIIO_SIZE 0x00100000 +#define BONITO_PCIIO_BASE 0x1fd00000UL +#define BONITO_PCIIO_LEGACY 0x00004000UL +#define BONITO_PCIIO_SIZE 0x00100000UL #define BONITO_PCIIO_TOP (BONITO_PCIIO_BASE+BONITO_PCIIO_SIZE-1) -#define BONITO_PCICFG_BASE 0x1fe80000 -#define BONITO_PCICFG_SIZE 0x00080000 +#define BONITO_PCICFG_BASE 0x1fe80000UL +#define BONITO_PCICFG_SIZE 0x00080000UL #define BONITO_PCICFG_TOP (BONITO_PCICFG_BASE+BONITO_PCICFG_SIZE-1) /* Bonito Register Bases */ @@ -149,8 +149,9 @@ #define BONITO_PCIMAP_PCIMAP_LO1_SHIFT 6 #define BONITO_PCIMAP_PCIMAP_LO2 0x0003f000 #define BONITO_PCIMAP_PCIMAP_LO2_SHIFT 12 +#define BONITO_PCIMAP_PCIMAP_2 0x00040000 /* real bonito only */ #define BONITO_PCIMAP_WIN(WIN,ADDR) ((((ADDR)>>26) & BONITO_PCIMAP_PCIMAP_LO0) << ((WIN)*6)) -#define BONITO_PCIMAP_WINSIZE (1<<26) +#define BONITO_PCIMAP_WINSIZE (1UL<<26) #define BONITO_PCIMAP_WINOFFSET(ADDR) ((ADDR) & (BONITO_PCIMAP_WINSIZE - 1)) #define BONITO_PCIMAP_WINBASE(ADDR) ((ADDR) << 26) |