Date: Fri, 10 Nov 2006 18:21:08 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 109691 for review Message-ID: <200611101821.kAAIL8sU085116@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=109691 Change 109691 by sam@sam_ebb on 2006/11/10 18:20:40 Change expansion bus CSx register defs from bit shifts to masks so I stop making stupid mistakes. While here add the rest of the bits in the register and do space->tab conversion. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425reg.h#6 (text+ko) ==== @@ -311,31 +311,41 @@ #define IXP425_EXP_ADDR_T(x) (((x) & 3) << IXP425_EXP_ADDR_SHIFT) /* EXP_CSn bits */ -#define EXP_BYTE_EN (1 << 0) -#define EXP_WR_EN (1 << 1) -#define EXP_SPLT_EN (1 << 3) -#define EXP_MUX_EN (1 << 4) -#define EXP_HRDY_POL (1 << 5) -#define EXP_BYTE_RD16 (1 << 6) -#define EXP_SZ_512 (0 << 10) -#define EXP_SZ_1K (1 << 10) -#define EXP_SZ_2K (2 << 10) -#define EXP_SZ_4K (3 << 10) -#define EXP_SZ_8K (4 << 10) -#define EXP_SZ_16K (5 << 10) -#define EXP_SZ_32K (6 << 10) -#define EXP_SZ_64K (7 << 10) -#define EXP_SZ_128K (8 << 10) -#define EXP_SZ_256K (9 << 10) -#define EXP_SZ_512K (10 << 10) -#define EXP_SZ_1M (11 << 10) -#define EXP_SZ_2M (12 << 10) -#define EXP_SZ_4M (13 << 10) -#define EXP_SZ_8M (14 << 10) -#define EXP_SZ_16M (15 << 10) -#define EXP_CYC_INTEL (0 << 14) -#define EXP_CYC_MOTO (1 << 14) -#define EXP_CYC_HPI (2 << 14) +#define EXP_BYTE_EN 0x00000001 /* bus uses only 8-bit data */ +#define EXP_WR_EN 0x00000002 /* ena writes to CS region */ +/* bit 2 is reserved */ +#define EXP_SPLT_EN 0x00000008 /* ena AHB split transfers */ +#define EXP_MUX_EN 0x00000010 /* multiplexed address/data */ +#define EXP_HRDY_POL 0x00000020 /* HPI|HRDY polarity */ +#define EXP_BYTE_RD16 0x00000040 /* byte rd access to word dev */ +#define EXP_CNFG 0x00003c00 /* device config size */ +#define EXP_SZ_512 (0 << 10) +#define EXP_SZ_1K (1 << 10) +#define EXP_SZ_2K (2 << 10) +#define EXP_SZ_4K (3 << 10) +#define EXP_SZ_8K (4 << 10) +#define EXP_SZ_16K (5 << 10) +#define EXP_SZ_32K (6 << 10) +#define EXP_SZ_64K (7 << 10) +#define EXP_SZ_128K (8 << 10) +#define EXP_SZ_256K (9 << 10) +#define EXP_SZ_512K (10 << 10) +#define EXP_SZ_1M (11 << 10) +#define EXP_SZ_2M (12 << 10) +#define EXP_SZ_4M (13 << 10) +#define EXP_SZ_8M (14 << 10) +#define EXP_SZ_16M (15 << 10) +#define EXP_CYC_TYPE 0x0000c000 /* bus cycle "type" */ +#define EXP_CYC_INTEL (0 << 14) +#define EXP_CYC_MOTO (1 << 14) +#define EXP_CYC_HPI (2 << 14) +#define EXP_T5 0x000f0000 /* recovery timing */ +#define EXP_T4 0x00300000 /* hold timing */ +#define EXP_T3 0x03c00000 /* strobe timing */ +#define EXP_T2 0x0c000000 /* setup/chip select timing */ +#define EXP_T1 0x30000000 /* address timing */ +/* bit 30 is reserved */ +#define EXP_CS_EN 0x80000000 /* chip select enabled */ /* EXP_CNFG0 bits */ #define EXP_CNFG0_8BIT (1 << 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611101821.kAAIL8sU085116>