diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/ata.c | 46 | ||||
-rwxr-xr-x | firmware/target/coldfire/ata-target.h | 68 | ||||
-rwxr-xr-x | firmware/target/coldfire/iaudio/x5/ata-target.h | 26 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/ata-target.h | 26 |
4 files changed, 69 insertions, 97 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index 39827f7188..00ef0e8eb5 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c | |||
@@ -36,51 +36,7 @@ | |||
36 | 36 | ||
37 | #define SECTOR_SIZE (512) | 37 | #define SECTOR_SIZE (512) |
38 | 38 | ||
39 | #if (CONFIG_CPU == MCF5249) || (CONFIG_CPU == MCF5250) | 39 | #if CONFIG_CPU == SH7034 |
40 | |||
41 | /* asm optimised read & write loops */ | ||
42 | |||
43 | #define NOINLINE_ATTR __attribute__((noinline)) /* don't inline the loops */ | ||
44 | |||
45 | #define ATA_IOBASE 0x20000000 | ||
46 | #define ATA_DATA (*((volatile unsigned short*)(ATA_IOBASE + 0x20))) | ||
47 | #define ATA_CONTROL (*((volatile unsigned short*)(ATA_IOBASE + 0x1c))) | ||
48 | |||
49 | #define ATA_ERROR (*((volatile unsigned short*)(ATA_IOBASE + 0x22))) | ||
50 | #define ATA_NSECTOR (*((volatile unsigned short*)(ATA_IOBASE + 0x24))) | ||
51 | #define ATA_SECTOR (*((volatile unsigned short*)(ATA_IOBASE + 0x26))) | ||
52 | #define ATA_LCYL (*((volatile unsigned short*)(ATA_IOBASE + 0x28))) | ||
53 | #define ATA_HCYL (*((volatile unsigned short*)(ATA_IOBASE + 0x2a))) | ||
54 | #define ATA_SELECT (*((volatile unsigned short*)(ATA_IOBASE + 0x2c))) | ||
55 | #define ATA_COMMAND (*((volatile unsigned short*)(ATA_IOBASE + 0x2e))) | ||
56 | |||
57 | #define STATUS_BSY 0x8000 | ||
58 | #define STATUS_RDY 0x4000 | ||
59 | #define STATUS_DF 0x2000 | ||
60 | #define STATUS_DRQ 0x0800 | ||
61 | #define STATUS_ERR 0x0100 | ||
62 | |||
63 | #define ERROR_ABRT 0x0400 | ||
64 | |||
65 | #define WRITE_PATTERN1 0xa5 | ||
66 | #define WRITE_PATTERN2 0x5a | ||
67 | #define WRITE_PATTERN3 0xaa | ||
68 | #define WRITE_PATTERN4 0x55 | ||
69 | |||
70 | #define READ_PATTERN1 0xa500 | ||
71 | #define READ_PATTERN2 0x5a00 | ||
72 | #define READ_PATTERN3 0xaa00 | ||
73 | #define READ_PATTERN4 0x5500 | ||
74 | |||
75 | #define READ_PATTERN1_MASK 0xff00 | ||
76 | #define READ_PATTERN2_MASK 0xff00 | ||
77 | #define READ_PATTERN3_MASK 0xff00 | ||
78 | #define READ_PATTERN4_MASK 0xff00 | ||
79 | |||
80 | #define SET_REG(reg,val) reg = ((val) << 8) | ||
81 | #define SET_16BITREG(reg,val) reg = (val) | ||
82 | |||
83 | #elif CONFIG_CPU == SH7034 | ||
84 | 40 | ||
85 | /* asm optimised read & write loops */ | 41 | /* asm optimised read & write loops */ |
86 | 42 | ||
diff --git a/firmware/target/coldfire/ata-target.h b/firmware/target/coldfire/ata-target.h new file mode 100755 index 0000000000..4a28c3ae3f --- /dev/null +++ b/firmware/target/coldfire/ata-target.h | |||
@@ -0,0 +1,68 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2006 by Linus Nielsen Feltzing | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | #ifndef ATA_TARGET_H | ||
20 | #define ATA_TARGET_H | ||
21 | |||
22 | /* asm optimised read & write loops */ | ||
23 | |||
24 | #define NOINLINE_ATTR __attribute__((noinline)) /* don't inline the loops */ | ||
25 | |||
26 | #define ATA_IOBASE 0x20000000 | ||
27 | #define ATA_DATA (*((volatile unsigned short*)(ATA_IOBASE + 0x20))) | ||
28 | #define ATA_CONTROL (*((volatile unsigned short*)(ATA_IOBASE + 0x1c))) | ||
29 | |||
30 | #define ATA_ERROR (*((volatile unsigned short*)(ATA_IOBASE + 0x22))) | ||
31 | #define ATA_NSECTOR (*((volatile unsigned short*)(ATA_IOBASE + 0x24))) | ||
32 | #define ATA_SECTOR (*((volatile unsigned short*)(ATA_IOBASE + 0x26))) | ||
33 | #define ATA_LCYL (*((volatile unsigned short*)(ATA_IOBASE + 0x28))) | ||
34 | #define ATA_HCYL (*((volatile unsigned short*)(ATA_IOBASE + 0x2a))) | ||
35 | #define ATA_SELECT (*((volatile unsigned short*)(ATA_IOBASE + 0x2c))) | ||
36 | #define ATA_COMMAND (*((volatile unsigned short*)(ATA_IOBASE + 0x2e))) | ||
37 | |||
38 | #define STATUS_BSY 0x8000 | ||
39 | #define STATUS_RDY 0x4000 | ||
40 | #define STATUS_DF 0x2000 | ||
41 | #define STATUS_DRQ 0x0800 | ||
42 | #define STATUS_ERR 0x0100 | ||
43 | |||
44 | #define ERROR_ABRT 0x0400 | ||
45 | |||
46 | #define WRITE_PATTERN1 0xa5 | ||
47 | #define WRITE_PATTERN2 0x5a | ||
48 | #define WRITE_PATTERN3 0xaa | ||
49 | #define WRITE_PATTERN4 0x55 | ||
50 | |||
51 | #define READ_PATTERN1 0xa500 | ||
52 | #define READ_PATTERN2 0x5a00 | ||
53 | #define READ_PATTERN3 0xaa00 | ||
54 | #define READ_PATTERN4 0x5500 | ||
55 | |||
56 | #define READ_PATTERN1_MASK 0xff00 | ||
57 | #define READ_PATTERN2_MASK 0xff00 | ||
58 | #define READ_PATTERN3_MASK 0xff00 | ||
59 | #define READ_PATTERN4_MASK 0xff00 | ||
60 | |||
61 | #define SET_REG(reg,val) reg = ((val) << 8) | ||
62 | #define SET_16BITREG(reg,val) reg = (val) | ||
63 | |||
64 | void ata_reset(void); | ||
65 | void ata_device_init(void); | ||
66 | bool ata_is_coldstart(void); | ||
67 | |||
68 | #endif | ||
diff --git a/firmware/target/coldfire/iaudio/x5/ata-target.h b/firmware/target/coldfire/iaudio/x5/ata-target.h deleted file mode 100755 index 1801a7d376..0000000000 --- a/firmware/target/coldfire/iaudio/x5/ata-target.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2006 by Linus Nielsen Feltzing | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | #ifndef ATA_TARGET_H | ||
20 | #define ATA_TARGET_H | ||
21 | |||
22 | void ata_reset(void); | ||
23 | void ata_device_init(void); | ||
24 | bool ata_is_coldstart(void); | ||
25 | |||
26 | #endif | ||
diff --git a/firmware/target/coldfire/iriver/ata-target.h b/firmware/target/coldfire/iriver/ata-target.h deleted file mode 100644 index 1801a7d376..0000000000 --- a/firmware/target/coldfire/iriver/ata-target.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2006 by Linus Nielsen Feltzing | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | #ifndef ATA_TARGET_H | ||
20 | #define ATA_TARGET_H | ||
21 | |||
22 | void ata_reset(void); | ||
23 | void ata_device_init(void); | ||
24 | bool ata_is_coldstart(void); | ||
25 | |||
26 | #endif | ||