diff options
| author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-05-17 15:15:38 +0000 |
|---|---|---|
| committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2010-05-17 15:15:38 +0000 |
| commit | 64f5033574d80df20ad2cb96e23bb13d73eaf062 (patch) | |
| tree | e89b9dbe95e00fd515fe5dc5c926c0a48899f7eb /firmware/drivers/ata.c | |
| parent | ceeb7576a92839fba4c8d70ed12c15f6239d5289 (diff) | |
| download | rockbox-64f5033574d80df20ad2cb96e23bb13d73eaf062.tar.gz rockbox-64f5033574d80df20ad2cb96e23bb13d73eaf062.zip | |
Do s/SWAP_WORDS/ATA_SWAP_WORDS/ to prevent namespace clashes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26111 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/ata.c')
| -rw-r--r-- | firmware/drivers/ata.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index 4780cf5c0f..ff463e52d1 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c @@ -280,7 +280,7 @@ STATICIRAM ICODE_ATTR void copy_read_sectors(unsigned char* buf, int wordcount) do { tmp = ATA_DATA; -#if defined(SWAP_WORDS) || defined(ROCKBOX_LITTLE_ENDIAN) +#if defined(ATA_SWAP_WORDS) || defined(ROCKBOX_LITTLE_ENDIAN) *buf++ = tmp & 0xff; /* I assume big endian */ *buf++ = tmp >> 8; /* and don't use the SWAB16 macro */ #else @@ -295,7 +295,7 @@ STATICIRAM ICODE_ATTR void copy_read_sectors(unsigned char* buf, int wordcount) unsigned short* wbufend = wbuf + wordcount; do { -#ifdef SWAP_WORDS +#ifdef ATA_SWAP_WORDS *wbuf = swap16(ATA_DATA); #else *wbuf = ATA_DATA; @@ -315,7 +315,7 @@ STATICIRAM ICODE_ATTR void copy_write_sectors(const unsigned char* buf, const unsigned char* bufend = buf + wordcount*2; do { -#if defined(SWAP_WORDS) || defined(ROCKBOX_LITTLE_ENDIAN) +#if defined(ATA_SWAP_WORDS) || defined(ROCKBOX_LITTLE_ENDIAN) tmp = (unsigned short) *buf++; tmp |= (unsigned short) *buf++ << 8; SET_16BITREG(ATA_DATA, tmp); @@ -332,7 +332,7 @@ STATICIRAM ICODE_ATTR void copy_write_sectors(const unsigned char* buf, unsigned short* wbufend = wbuf + wordcount; do { -#ifdef SWAP_WORDS +#ifdef ATA_SWAP_WORDS SET_16BITREG(ATA_DATA, swap16(*wbuf)); #else SET_16BITREG(ATA_DATA, *wbuf); @@ -1127,7 +1127,7 @@ static int identify(void) for (i=0; i<SECTOR_SIZE/2; i++) { /* the IDENTIFY words are already swapped, so we need to treat this info differently that normal sector data */ -#if defined(ROCKBOX_BIG_ENDIAN) && !defined(SWAP_WORDS) +#if defined(ROCKBOX_BIG_ENDIAN) && !defined(ATA_SWAP_WORDS) identify_info[i] = swap16(ATA_DATA); #else identify_info[i] = ATA_DATA; |