From 68754c496b16c6416ee601d6d9cc634e91e3b9f1 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 20 Feb 2006 19:42:29 +0000 Subject: 2006-02-20 Thomas Schwinge Remove unused and unsupported code. Consult the file `DEVELOPMENT' for details. Partly based on suggestions by Gianluca Guida . * i386/bogus/asc.h: Remove file. * i386/bogus/aha.h: Likewise. * i386/bogus/eaha.h: Likewise. * i386/bogus/sbic.h: Likewise. * i386/bogus/sci.h: Likewise. * i386/bogus/sii.h: Likewise. * i386/bogus/siop.h: Likewise. * i386/i386at/eisa.h: Likewise. * scsi/adapters/README: Likewise. * scsi/adapters/scsi_33C93.h: Likewise. * scsi/adapters/scsi_33C93_hdw.c: Likewise. * scsi/adapters/scsi_5380.h: Likewise. * scsi/adapters/scsi_5380_hdw.c: Likewise. * scsi/adapters/scsi_53C700.h: Likewise. * scsi/adapters/scsi_53C700_hdw.c: Likewise. * scsi/adapters/scsi_53C94.h: Likewise. * scsi/adapters/scsi_53C94_hdw.c: Likewise. * scsi/adapters/scsi_7061.h: Likewise. * scsi/adapters/scsi_7061_hdw.c: Likewise. * scsi/adapters/scsi_89352.h: Likewise. * scsi/adapters/scsi_89352_hdw.c: Likewise. * scsi/adapters/scsi_aha15.h: Likewise. * scsi/adapters/scsi_aha15_hdw.c: Likewise. * scsi/adapters/scsi_aha17_hdw.c: Likewise. * scsi/adapters/scsi_dma.h: Likewise. * scsi/adapters/scsi_user_dma.c: Likewise. * scsi/adapters/scsi_user_dma.h: Likewise. * scsi/compat_30.h: Likewise. * scsi/disk_label.c: Likewise. * scsi/mapped_scsi.c: Likewise. * scsi/mapped_scsi.h: Likewise. * scsi/pc_scsi_label.c: Likewise. * scsi/rz.c: Likewise. * scsi/rz.h: Likewise. * scsi/rz_audio.c: Likewise. * scsi/rz_cpu.c: Likewise. * scsi/rz_disk.c: Likewise. * scsi/rz_disk_bbr.c: Likewise. * scsi/rz_host.c: Likewise. * scsi/rz_labels.h: Likewise. * scsi/rz_tape.c: Likewise. * scsi/scsi.c: Likewise. * scsi/scsi.h: Likewise. * scsi/scsi2.h: Likewise. * scsi/scsi_alldevs.c: Likewise. * scsi/scsi_comm.c: Likewise. * scsi/scsi_cpu.c: Likewise. * scsi/scsi_defs.h: Likewise. * scsi/scsi_disk.c: Likewise. * scsi/scsi_endian.h: Likewise. * scsi/scsi_jukebox.c: Likewise. * scsi/scsi_optical.c: Likewise. * scsi/scsi_printer.c: Likewise. * scsi/scsi_rom.c: Likewise. * scsi/scsi_scanner.c: Likewise. * scsi/scsi_tape.c: Likewise. * scsi/scsi_worm.c: Likewise. * i386/i386at/autoconf.c: Don't include and anymore and adopt all users of NAHA and NEAHA as if it were always defined to `0'. * i386/i386at/conf.c: Likewise. * Makefile.in (scsi-files): Remove variable and all users of it. --- i386/i386at/autoconf.c | 143 ------------------------------------------------- i386/i386at/conf.c | 35 ------------ i386/i386at/eisa.h | 110 ------------------------------------- 3 files changed, 288 deletions(-) delete mode 100644 i386/i386at/eisa.h (limited to 'i386/i386at') diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c index b8771e8..51f2a0a 100644 --- a/i386/i386at/autoconf.c +++ b/i386/i386at/autoconf.c @@ -47,18 +47,6 @@ #define SPL_TTY (vm_offset_t)SPLTTY -#include -#if NAHA > 0 -extern struct bus_driver aha_driver; -extern int aha_intr(); -#endif /* NAHA */ - -#include -#if NEAHA > 0 -extern struct bus_driver eaha_driver; -extern int eaha_intr(); -#endif /* NEAHA */ - #include #if NCOM > 0 extern struct bus_driver comdriver; @@ -76,74 +64,6 @@ struct bus_ctlr bus_master_init[] = { /* driver name unit intr address len phys_address adaptor alive flags spl pic */ -#ifndef LINUX_DEV -#if NAHA > 0 - {&aha_driver, "ahac", 0, aha_intr, 0x330, 4, 0x330, - '?', 0, 0, SPL_FIVE, 11}, - -#if NAHA > 1 - - {&aha_driver, "ahac", 1, aha_intr, 0x234, 4, 0x234, - '?', 0, 0, SPL_FIVE, 12}, - {&aha_driver, "ahac", 1, aha_intr, 0x230, 4, 0x230, - '?', 0, 0, SPL_FIVE, 12}, - {&aha_driver, "ahac", 1, aha_intr, 0x134, 4, 0x134, - '?', 0, 0, SPL_FIVE, 12}, - {&aha_driver, "ahac", 1, aha_intr, 0x130, 4, 0x130, - '?', 0, 0, SPL_FIVE, 12}, - -#else - - {&aha_driver, "ahac", 0, aha_intr, 0x334, 4, 0x334, - '?', 0, 0, SPL_FIVE, 11}, - {&aha_driver, "ahac", 0, aha_intr, 0x234, 4, 0x234, - '?', 0, 0, SPL_FIVE, 11}, - {&aha_driver, "ahac", 0, aha_intr, 0x230, 4, 0x230, - '?', 0, 0, SPL_FIVE, 11}, - {&aha_driver, "ahac", 0, aha_intr, 0x134, 4, 0x134, - '?', 0, 0, SPL_FIVE, 11}, - {&aha_driver, "ahac", 0, aha_intr, 0x130, 4, 0x130, - '?', 0, 0, SPL_FIVE, 11}, - -#endif /* NAHA > 1 */ -#endif /* NAHA > 0*/ - -#if NEAHA > 0 -{&eaha_driver, "eahac", 0, eaha_intr, 0x0000, 4, 0x0000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0x1000, 4, 0x1000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0x2000, 4, 0x2000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0x3000, 4, 0x3000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0x4000, 4, 0x4000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0x5000, 4, 0x5000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0x6000, 4, 0x6000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0x7000, 4, 0x7000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0x8000, 4, 0x8000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0x9000, 4, 0x9000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0xa000, 4, 0xa000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0xb000, 4, 0xb000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0xc000, 4, 0xc000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0xd000, 4, 0xd000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0xe000, 4, 0xe000, - '?', 0, 0, SPL_FIVE, 12}, -{&eaha_driver, "eahac", 0, eaha_intr, 0xf000, 4, 0xf000, - '?', 0, 0, SPL_FIVE, 12}, -#endif /* NEAHA > 0 */ -#endif /* ! LINUX_DEV */ - 0 }; @@ -153,69 +73,6 @@ struct bus_device bus_device_init[] = { /* driver name unit intr address am phys_address adaptor alive ctlr slave flags *mi *next sysdep sysdep */ -#ifndef LINUX_DEV -#if NAHA > 0 -{ &aha_driver, "rz", 0, 0, 0x0,0, 0, '?', 0, 0, 0, 0, }, -{ &aha_driver, "rz", 1, 0, 0x0,0, 0, '?', 0, 0, 1, 0, }, -{ &aha_driver, "rz", 2, 0, 0x0,0, 0, '?', 0, 0, 2, 0, }, -{ &aha_driver, "rz", 3, 0, 0x0,0, 0, '?', 0, 0, 3, 0, }, -{ &aha_driver, "rz", 4, 0, 0x0,0, 0, '?', 0, 0, 4, 0, }, -{ &aha_driver, "rz", 5, 0, 0x0,0, 0, '?', 0, 0, 5, 0, }, -{ &aha_driver, "rz", 6, 0, 0x0,0, 0, '?', 0, 0, 6, 0, }, -{ &aha_driver, "rz", 7, 0, 0x0,0, 0, '?', 0, 0, 7, 0, }, - -{ &aha_driver, "tz", 0, 0, 0x0,0, 0, '?', 0, 0, 0, 0, }, -{ &aha_driver, "tz", 1, 0, 0x0,0, 0, '?', 0, 0, 1, 0, }, -{ &aha_driver, "tz", 2, 0, 0x0,0, 0, '?', 0, 0, 2, 0, }, -{ &aha_driver, "tz", 3, 0, 0x0,0, 0, '?', 0, 0, 3, 0, }, -{ &aha_driver, "tz", 4, 0, 0x0,0, 0, '?', 0, 0, 4, 0, }, -{ &aha_driver, "tz", 5, 0, 0x0,0, 0, '?', 0, 0, 5, 0, }, -{ &aha_driver, "tz", 6, 0, 0x0,0, 0, '?', 0, 0, 6, 0, }, -{ &aha_driver, "tz", 7, 0, 0x0,0, 0, '?', 0, 0, 7, 0, }, - -#if NAHA > 1 - -{ &aha_driver, "rz", 8, 0, 0x0,0, 0, '?', 0, 1, 0, 0, }, -{ &aha_driver, "rz", 9, 0, 0x0,0, 0, '?', 0, 1, 1, 0, }, -{ &aha_driver, "rz", 10, 0, 0x0,0, 0, '?', 0, 1, 2, 0, }, -{ &aha_driver, "rz", 11, 0, 0x0,0, 0, '?', 0, 1, 3, 0, }, -{ &aha_driver, "rz", 12, 0, 0x0,0, 0, '?', 0, 1, 4, 0, }, -{ &aha_driver, "rz", 13, 0, 0x0,0, 0, '?', 0, 1, 5, 0, }, -{ &aha_driver, "rz", 14, 0, 0x0,0, 0, '?', 0, 1, 6, 0, }, -{ &aha_driver, "rz", 15, 0, 0x0,0, 0, '?', 0, 1, 7, 0, }, - -{ &aha_driver, "tz", 8, 0, 0x0,0, 0, '?', 0, 1, 0, 0, }, -{ &aha_driver, "tz", 9, 0, 0x0,0, 0, '?', 0, 1, 1, 0, }, -{ &aha_driver, "tz", 10, 0, 0x0,0, 0, '?', 0, 1, 2, 0, }, -{ &aha_driver, "tz", 11, 0, 0x0,0, 0, '?', 0, 1, 3, 0, }, -{ &aha_driver, "tz", 12, 0, 0x0,0, 0, '?', 0, 1, 4, 0, }, -{ &aha_driver, "tz", 13, 0, 0x0,0, 0, '?', 0, 1, 5, 0, }, -{ &aha_driver, "tz", 14, 0, 0x0,0, 0, '?', 0, 1, 6, 0, }, -{ &aha_driver, "tz", 15, 0, 0x0,0, 0, '?', 0, 1, 7, 0, }, -#endif /* NAHA > 1 */ -#endif /* NAHA > 0 */ - -#if NEAHA > 0 -{ &eaha_driver, "rz", 0, 0, 0x0,0, 0, '?', 0, 0, 0, 0, }, -{ &eaha_driver, "rz", 1, 0, 0x0,0, 0, '?', 0, 0, 1, 0, }, -{ &eaha_driver, "rz", 2, 0, 0x0,0, 0, '?', 0, 0, 2, 0, }, -{ &eaha_driver, "rz", 3, 0, 0x0,0, 0, '?', 0, 0, 3, 0, }, -{ &eaha_driver, "rz", 4, 0, 0x0,0, 0, '?', 0, 0, 4, 0, }, -{ &eaha_driver, "rz", 5, 0, 0x0,0, 0, '?', 0, 0, 5, 0, }, -{ &eaha_driver, "rz", 6, 0, 0x0,0, 0, '?', 0, 0, 6, 0, }, -{ &eaha_driver, "rz", 7, 0, 0x0,0, 0, '?', 0, 0, 7, 0, }, - -{ &eaha_driver, "tz", 0, 0, 0x0,0, 0, '?', 0, 0, 0, 0, }, -{ &eaha_driver, "tz", 1, 0, 0x0,0, 0, '?', 0, 0, 1, 0, }, -{ &eaha_driver, "tz", 2, 0, 0x0,0, 0, '?', 0, 0, 2, 0, }, -{ &eaha_driver, "tz", 3, 0, 0x0,0, 0, '?', 0, 0, 3, 0, }, -{ &eaha_driver, "tz", 4, 0, 0x0,0, 0, '?', 0, 0, 4, 0, }, -{ &eaha_driver, "tz", 5, 0, 0x0,0, 0, '?', 0, 0, 5, 0, }, -{ &eaha_driver, "tz", 6, 0, 0x0,0, 0, '?', 0, 0, 6, 0, }, -{ &eaha_driver, "tz", 7, 0, 0x0,0, 0, '?', 0, 0, 7, 0, }, -#endif /* NEAHA > 0*/ -#endif /* ! LINUX_DEV */ - #if NCOM > 0 {&comdriver, "com", 0, comintr, 0x3f8, 8, 0x3f8, '?', 0, -1, -1, 0, 0, 0, SPL_TTY, 4}, diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c index a7d420f..2e62ca0 100644 --- a/i386/i386at/conf.c +++ b/i386/i386at/conf.c @@ -36,18 +36,6 @@ extern int timeopen(), timeclose(); extern vm_offset_t timemmap(); #define timename "time" -#include -#if NAHA > 0 -int rz_open(), rz_close(), rz_read(), rz_write(); -int rz_get_status(), rz_set_status(), rz_devinfo(); -int cd_open(), cd_close(), cd_read(), cd_write(); -#define rzname "sd" -#define tzname "st" -#define scname "sc" /* processors */ -#define cdname "cd_audio" /* CD-ROM DA */ - -#endif /*NAHA > 0*/ - #include #if NPAR > 0 extern int paropen(), paroutput(), pargetstat(), parsetstat(), @@ -134,29 +122,6 @@ struct dev_ops dev_name_list[] = nodev }, #ifndef LINUX_DEV -#if NAHA > 0 - { rzname, rz_open, rz_close, rz_read, - rz_write, rz_get_status, rz_set_status, nomap, - nodev, nulldev, nulldev, 1024, /* 8 */ - rz_devinfo }, - - { tzname, rz_open, rz_close, rz_read, - rz_write, rz_get_status, rz_set_status, nomap, - nodev, nulldev, nulldev, 8, - nodev }, - - { cdname, cd_open, cd_close, cd_read, - cd_write, nodev, nodev, nomap, - nodev, nulldev, nulldev, 8, - nodev }, - - { scname, rz_open, rz_close, rz_read, - rz_write, rz_get_status, rz_set_status, nomap, - nodev, nulldev, nulldev, 8, - nodev }, - -#endif /*NAHA > 0*/ - #if NPAR > 0 { parname, paropen, nulldev, nulldev, paroutput, pargetstat, parsetstat, nomap, diff --git a/i386/i386at/eisa.h b/i386/i386at/eisa.h deleted file mode 100644 index 33629ca..0000000 --- a/i386/i386at/eisa.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Mach Operating System - * Copyright (c) 1993 Carnegie Mellon University - * All Rights Reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon - * the rights to redistribute these changes. - */ -/* - * Copyright 1992 by Open Software Foundation, - * Grenoble, FRANCE - * - * All Rights Reserved - * - * Permission to use, copy, modify, and distribute this software and - * its documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appears in all copies and - * that both the copyright notice and this permission notice appear in - * supporting documentation, and that the name of OSF or Open Software - * Foundation not be used in advertising or publicity pertaining to - * distribution of the software without specific, written prior - * permission. - * - * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, - * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM - * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT, - * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -/* - * Eisa defs - */ - -#ifndef _I386AT_EISA_H_ -#define _I386AT_EISA_H_ - -#include - -#if EISA -extern boolean_t is_eisa_bus; - -#define EISA_ID_REG(board, byte) (0xc80 | (byte) | ((board) << 12)) - -#define EISA_ID_REG_0 0x0 -#define EISA_ID_REG_1 0x1 -#define EISA_ID_REG_2 0x2 -#define EISA_ID_REG_3 0x3 - -#define EISA_SYSTEM_BOARD 0x0 - -struct std_board_id { - unsigned revision: 8, /* Revision number */ - product: 8; /* Product number */ -}; - -struct sys_board_id { - unsigned bus_vers: 3, /* EISA bus version */ - reserved: 13; /* Manufacturer reserved */ -}; - -struct board_id { - union { - struct sys_board_id sys_id; - struct std_board_id std_id; - } bd_id; - unsigned name_char_2: 5, /* 3nd compressed char */ - name_char_1: 5, /* 2nd compressed char */ - name_char_0: 5, /* 1st compressed char */ - not_eisa: 1; /* 0 if eisa board */ -}; - -union eisa_board_id { - unsigned char byte[4]; - struct board_id id; -}; - -typedef union eisa_board_id eisa_board_id_t; - - -/* Additional DMA registers */ - -#define DMA0HIPAGE 0x481 /* DMA 0 address: bits 24-31 */ -#define DMA0HICNT 0x405 /* DMA 0 count: bits 16-23 */ - - -#else /* EISA */ -#define is_eisa_bus FALSE -#define probe_eisa() -#endif /* EISA */ - -#endif /* _I386AT_EISA_H_ */ -- cgit v1.2.3