From ede3d646b9a248a1893ec20482eaa30641df078e Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Mon, 30 Oct 2006 09:38:34 +0000 Subject: move coldfire ata defines to a shared ata-target.h git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11395 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/ata.c | 46 +---------------- firmware/target/coldfire/ata-target.h | 68 +++++++++++++++++++++++++ firmware/target/coldfire/iaudio/x5/ata-target.h | 26 ---------- firmware/target/coldfire/iriver/ata-target.h | 26 ---------- 4 files changed, 69 insertions(+), 97 deletions(-) create mode 100755 firmware/target/coldfire/ata-target.h delete mode 100755 firmware/target/coldfire/iaudio/x5/ata-target.h delete mode 100644 firmware/target/coldfire/iriver/ata-target.h (limited to 'firmware') 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 @@ #define SECTOR_SIZE (512) -#if (CONFIG_CPU == MCF5249) || (CONFIG_CPU == MCF5250) - -/* asm optimised read & write loops */ - -#define NOINLINE_ATTR __attribute__((noinline)) /* don't inline the loops */ - -#define ATA_IOBASE 0x20000000 -#define ATA_DATA (*((volatile unsigned short*)(ATA_IOBASE + 0x20))) -#define ATA_CONTROL (*((volatile unsigned short*)(ATA_IOBASE + 0x1c))) - -#define ATA_ERROR (*((volatile unsigned short*)(ATA_IOBASE + 0x22))) -#define ATA_NSECTOR (*((volatile unsigned short*)(ATA_IOBASE + 0x24))) -#define ATA_SECTOR (*((volatile unsigned short*)(ATA_IOBASE + 0x26))) -#define ATA_LCYL (*((volatile unsigned short*)(ATA_IOBASE + 0x28))) -#define ATA_HCYL (*((volatile unsigned short*)(ATA_IOBASE + 0x2a))) -#define ATA_SELECT (*((volatile unsigned short*)(ATA_IOBASE + 0x2c))) -#define ATA_COMMAND (*((volatile unsigned short*)(ATA_IOBASE + 0x2e))) - -#define STATUS_BSY 0x8000 -#define STATUS_RDY 0x4000 -#define STATUS_DF 0x2000 -#define STATUS_DRQ 0x0800 -#define STATUS_ERR 0x0100 - -#define ERROR_ABRT 0x0400 - -#define WRITE_PATTERN1 0xa5 -#define WRITE_PATTERN2 0x5a -#define WRITE_PATTERN3 0xaa -#define WRITE_PATTERN4 0x55 - -#define READ_PATTERN1 0xa500 -#define READ_PATTERN2 0x5a00 -#define READ_PATTERN3 0xaa00 -#define READ_PATTERN4 0x5500 - -#define READ_PATTERN1_MASK 0xff00 -#define READ_PATTERN2_MASK 0xff00 -#define READ_PATTERN3_MASK 0xff00 -#define READ_PATTERN4_MASK 0xff00 - -#define SET_REG(reg,val) reg = ((val) << 8) -#define SET_16BITREG(reg,val) reg = (val) - -#elif CONFIG_CPU == SH7034 +#if CONFIG_CPU == SH7034 /* asm optimised read & write loops */ 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 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2006 by Linus Nielsen Feltzing + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#ifndef ATA_TARGET_H +#define ATA_TARGET_H + +/* asm optimised read & write loops */ + +#define NOINLINE_ATTR __attribute__((noinline)) /* don't inline the loops */ + +#define ATA_IOBASE 0x20000000 +#define ATA_DATA (*((volatile unsigned short*)(ATA_IOBASE + 0x20))) +#define ATA_CONTROL (*((volatile unsigned short*)(ATA_IOBASE + 0x1c))) + +#define ATA_ERROR (*((volatile unsigned short*)(ATA_IOBASE + 0x22))) +#define ATA_NSECTOR (*((volatile unsigned short*)(ATA_IOBASE + 0x24))) +#define ATA_SECTOR (*((volatile unsigned short*)(ATA_IOBASE + 0x26))) +#define ATA_LCYL (*((volatile unsigned short*)(ATA_IOBASE + 0x28))) +#define ATA_HCYL (*((volatile unsigned short*)(ATA_IOBASE + 0x2a))) +#define ATA_SELECT (*((volatile unsigned short*)(ATA_IOBASE + 0x2c))) +#define ATA_COMMAND (*((volatile unsigned short*)(ATA_IOBASE + 0x2e))) + +#define STATUS_BSY 0x8000 +#define STATUS_RDY 0x4000 +#define STATUS_DF 0x2000 +#define STATUS_DRQ 0x0800 +#define STATUS_ERR 0x0100 + +#define ERROR_ABRT 0x0400 + +#define WRITE_PATTERN1 0xa5 +#define WRITE_PATTERN2 0x5a +#define WRITE_PATTERN3 0xaa +#define WRITE_PATTERN4 0x55 + +#define READ_PATTERN1 0xa500 +#define READ_PATTERN2 0x5a00 +#define READ_PATTERN3 0xaa00 +#define READ_PATTERN4 0x5500 + +#define READ_PATTERN1_MASK 0xff00 +#define READ_PATTERN2_MASK 0xff00 +#define READ_PATTERN3_MASK 0xff00 +#define READ_PATTERN4_MASK 0xff00 + +#define SET_REG(reg,val) reg = ((val) << 8) +#define SET_16BITREG(reg,val) reg = (val) + +void ata_reset(void); +void ata_device_init(void); +bool ata_is_coldstart(void); + +#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 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Linus Nielsen Feltzing - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#ifndef ATA_TARGET_H -#define ATA_TARGET_H - -void ata_reset(void); -void ata_device_init(void); -bool ata_is_coldstart(void); - -#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 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Linus Nielsen Feltzing - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#ifndef ATA_TARGET_H -#define ATA_TARGET_H - -void ata_reset(void); -void ata_device_init(void); -bool ata_is_coldstart(void); - -#endif -- cgit v1.2.3