Update of /cvsroot/linuxdc/linux-sh-dc/include/asm-sh
In directory usw-pr-cvs1:/tmp/cvs-serv9028/include/asm-sh
Modified Files:
ide.h
Removed Files:
dc_sysasic.h
Log Message:
Linux-SH 2.5.44 switchover
Index: ide.h
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/include/asm-sh/ide.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ide.h 1 May 2002 18:36:23 -0000 1.1
+++ ide.h 29 Oct 2002 15:20:22 -0000 1.2
@@ -17,15 +17,11 @@
#include <linux/config.h>
#include <asm/machvec.h>
-#include <asm/dc_sysasic.h>
-
#ifndef MAX_HWIFS
/* Should never have less than 2, ide-pci.c(ide_match_hwif) requires it */
#define MAX_HWIFS 2
#endif
-#define ide__sti() __sti()
-
static __inline__ int ide_default_irq_hp600(ide_ioreg_t base)
{
switch (base) {
@@ -36,26 +32,11 @@
}
}
-static __inline__ int ide_default_irq_dreamcast(ide_ioreg_t base)
-{
- switch (base) {
- case 0x1f0:
- return HW_EVENT_EXT0;
- case 0x170:
- return HW_EVENT_EXT1;
- default:
- return 0;
- }
-}
-
static __inline__ int ide_default_irq(ide_ioreg_t base)
{
if (MACH_HP600) {
return ide_default_irq_hp600(base);
}
- if (MACH_DREAMCAST) {
- return ide_default_irq_dreamcast(base);
- }
switch (base) {
case 0x01f0: return 14;
case 0x0170: return 15;
@@ -112,7 +93,7 @@
static __inline__ void ide_init_default_hwifs(void)
{
-#ifndef CONFIG_BLK_DEV_IDEPCI
+#ifndef CONFIG_PCI
hw_regs_t hw;
int index;
@@ -121,33 +102,8 @@
hw.irq = ide_default_irq(ide_default_io_base(index));
ide_register_hw(&hw, NULL);
}
-#endif /* CONFIG_BLK_DEV_IDEPCI */
+#endif /* CONFIG_PCI */
}
-
-typedef union {
- unsigned all : 8; /* all of the bits together */
- struct {
- unsigned head : 4; /* always zeros here */
- unsigned unit : 1; /* drive select number, 0 or 1 */
- unsigned bit5 : 1; /* always 1 */
- unsigned lba : 1; /* using LBA instead of CHS */
- unsigned bit7 : 1; /* always 1 */
- } b;
- } select_t;
-
-#define ide_request_irq(irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id))
-#define ide_free_irq(irq,dev_id) free_irq((irq), (dev_id))
-#define ide_check_region(from,extent) check_region((from), (extent))
-#define ide_request_region(from,extent,name) request_region((from), (extent), (name))
-#define ide_release_region(from,extent) release_region((from), (extent))
-
-/*
- * The following are not needed for the non-m68k ports
- */
-#define ide_ack_intr(hwif) (1)
-#define ide_fix_driveid(id) do {} while (0)
-#define ide_release_lock(lock) do {} while (0)
-#define ide_get_lock(lock, hdlr, data) do {} while (0)
#endif /* __KERNEL__ */
--- dc_sysasic.h DELETED ---
|
