patch-2.4.23 linux-2.4.23/drivers/ide/ide-sibyte.c

• Lines: 80
• Date: 1969-12-31 16:00:00.000000000 -0800
• Orig file: linux-2.4.22/drivers/ide/ide-sibyte.c
• Orig date: 2003-08-25 04:44:41.000000000 -0700

diff -urN linux-2.4.22/drivers/ide/ide-sibyte.c linux-2.4.23/drivers/ide/ide-sibyte.c
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2001, 2002, 2003 Broadcom Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/*  Derived loosely from ide-pmac.c, so:
- *  
- *  Copyright (C) 1998 Paul Mackerras.
- *  Copyright (C) 1995-1998 Mark Lord
- */
-#include <linux/kernel.h>
-#include <linux/ide.h>
-
-#include <asm/sibyte/board.h>
-
-#define SIBYTE_IDE_BASE        (IO_SPACE_BASE + IDE_PHYS - mips_io_port_base)
-#define SIBYTE_IDE_REG(pcaddr) (SIBYTE_IDE_BASE + ((pcaddr) << 5))
-
-extern void sibyte_set_ideops(ide_hwif_t *hwif);
-
-void __init sibyte_ide_probe(void)
-{
-	int i;
-	ide_hwif_t *hwif = NULL;
-
-	/* 
-	 * Find the first untaken slot in hwifs.  Also set the io ops
-	 * to the non-swapping SiByte versions.  XXXKW It would be
-	 * nice to find a safe place to do this outside of
-	 * ide-sibyte.c so PCI-IDE would work without the SiByte
-	 * driver.
-	 */
-	for (i = 0; i < MAX_HWIFS; i++) {
-		sibyte_set_ideops(&ide_hwifs[i]);
-		if (!ide_hwifs[i].io_ports[IDE_DATA_OFFSET] && (hwif == NULL)) {
-			hwif = &ide_hwifs[i];
-		}
-	}
-	if (hwif == NULL) {
-		printk("No space for SiByte onboard IDE driver in ide_hwifs[].  Not enabled.\n");
-		return;
-	}
-
-	/*
-	 * Set up our stuff; we're a little odd because our io_ports
-	 * aren't in the usual place, and byte-swapping isn't
-	 * necessary.
-	 */
-	hwif->hw.io_ports[IDE_DATA_OFFSET]    = SIBYTE_IDE_REG(0x1f0);
-	hwif->hw.io_ports[IDE_ERROR_OFFSET]   = SIBYTE_IDE_REG(0x1f1);
-	hwif->hw.io_ports[IDE_NSECTOR_OFFSET] = SIBYTE_IDE_REG(0x1f2);
-	hwif->hw.io_ports[IDE_SECTOR_OFFSET]  = SIBYTE_IDE_REG(0x1f3);
-	hwif->hw.io_ports[IDE_LCYL_OFFSET]    = SIBYTE_IDE_REG(0x1f4);
-	hwif->hw.io_ports[IDE_HCYL_OFFSET]    = SIBYTE_IDE_REG(0x1f5);
-	hwif->hw.io_ports[IDE_SELECT_OFFSET]  = SIBYTE_IDE_REG(0x1f6);
-	hwif->hw.io_ports[IDE_STATUS_OFFSET]  = SIBYTE_IDE_REG(0x1f7);
-	hwif->hw.io_ports[IDE_CONTROL_OFFSET] = SIBYTE_IDE_REG(0x3f6);
-	hwif->hw.irq                          = K_INT_GB_IDE;
-	hwif->irq                             = hwif->hw.irq;
-	hwif->noprobe                         = 0;
-	hwif->hw.ack_intr                     = NULL;
-	hwif->mmio                            = 2;
-
-	memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
-	printk("SiByte onboard IDE configured as device %i\n", hwif-ide_hwifs);
-}