Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch remove mainbus pseudo floppy drive
details: https://anonhg.NetBSD.org/src/rev/e7965ef5c557
branches: trunk
changeset: 476314:e7965ef5c557
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Mon Sep 13 16:26:17 1999 +0000
description:
remove mainbus pseudo floppy drive
diffstat:
sys/arch/evbsh3/conf/CQREEKSH3 | 8 +-
sys/arch/evbsh3/evbsh3/conf.c | 10 +-
sys/arch/mmeye/conf/GENERIC | 6 +-
sys/arch/mmeye/conf/MMEYE | 6 +-
sys/arch/mmeye/conf/MMTA | 8 +-
sys/arch/mmeye/conf/MMTAICE | 8 +-
sys/arch/mmeye/conf/MMTANEW | 7 +-
sys/arch/mmeye/conf/MMTAROMNEW | 7 +-
sys/arch/mmeye/mmeye/conf.c | 10 +-
sys/arch/sh3/conf/files.sh3 | 10 +-
sys/arch/sh3/dev/fd.c | 1645 ----------------------------------------
sys/arch/sh3/dev/fdreg.h | 143 ---
sys/arch/sh3/sh3/mainbus.c | 11 +-
13 files changed, 17 insertions(+), 1862 deletions(-)
diffs (truncated from 2090 to 300 lines):
diff -r 6e6e991a697f -r e7965ef5c557 sys/arch/evbsh3/conf/CQREEKSH3
--- a/sys/arch/evbsh3/conf/CQREEKSH3 Mon Sep 13 15:50:01 1999 +0000
+++ b/sys/arch/evbsh3/conf/CQREEKSH3 Mon Sep 13 16:26:17 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CQREEKSH3,v 1.1 1999/09/13 10:30:22 itojun Exp $
+# $NetBSD: CQREEKSH3,v 1.2 1999/09/13 16:26:17 msaitoh Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -140,12 +140,6 @@
# Miscellaneous mass storage devices
-# ISA floppy
-#fdc0 at mainbus0 # standard PC floppy controllers
-#fdc1 at isa? port 0x370 irq ? drq ?
-#fd* at fdc? drive ? # the drives themselves
-# some machines need you to do this instead of fd*
-#fd0 at fdc0 drive 0
# Network Interfaces
diff -r 6e6e991a697f -r e7965ef5c557 sys/arch/evbsh3/evbsh3/conf.c
--- a/sys/arch/evbsh3/evbsh3/conf.c Mon Sep 13 15:50:01 1999 +0000
+++ b/sys/arch/evbsh3/evbsh3/conf.c Mon Sep 13 16:26:17 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.1 1999/09/13 10:30:26 itojun Exp $ */
+/* $NetBSD: conf.c,v 1.2 1999/09/13 16:26:18 msaitoh Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -40,8 +40,6 @@
#include "wd.h"
bdev_decl(wd);
bdev_decl(sw);
-#include "fdc.h"
-bdev_decl(fd);
#include "sd.h"
bdev_decl(sd);
#include "st.h"
@@ -61,7 +59,7 @@
{
bdev_disk_init(NWD,wd), /* 0: ST506/ESDI/IDE disk */
bdev_swap_init(1,sw), /* 1: swap pseudo-device */
- bdev_disk_init(NFDC,fd), /* 2: floppy diskette */
+ bdev_notdef(), /* 2 (was floppy diskette) */
bdev_notdef(), /* 3 (was QIC-02/QIC-36 tape) */
bdev_disk_init(NSD,sd), /* 4: SCSI disk */
bdev_tape_init(NST,st), /* 5: SCSI tape */
@@ -148,7 +146,7 @@
cdev_ptc_init(NPTY,ptc), /* 6: pseudo-tty master */
cdev_log_init(1,log), /* 7: /dev/klog */
cdev_tty_init(NCOM,com), /* 8: serial port */
- cdev_disk_init(NFDC,fd), /* 9: floppy disk */
+ cdev_notdef(), /* 9 (was floppy disk) */
cdev_tty_init(NSCIF,scif), /* 10: serial with FIFO */
cdev_tty_init(NSCI,sci), /* 11: serial */
cdev_notdef(), /* 12: */
@@ -240,7 +238,7 @@
/* 6 */ NODEV,
/* 7 */ NODEV,
/* 8 */ NODEV,
- /* 9 */ 2,
+ /* 9 */ NODEV,
/* 10 */ NODEV,
/* 11 */ NODEV,
/* 12 */ NODEV,
diff -r 6e6e991a697f -r e7965ef5c557 sys/arch/mmeye/conf/GENERIC
--- a/sys/arch/mmeye/conf/GENERIC Mon Sep 13 15:50:01 1999 +0000
+++ b/sys/arch/mmeye/conf/GENERIC Mon Sep 13 16:26:17 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1 1999/09/13 10:30:48 itojun Exp $
+# $NetBSD: GENERIC,v 1.2 1999/09/13 16:26:18 msaitoh Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -110,10 +110,6 @@
shb* at mainbus?
-# mainbus pseudo floppy
-#fdc0 at mainbus0 # mainbus pseudo floppy controllers
-#fd0 at fdc0 drive 0
-
com0 at shb? port 0xa4000000 irq 11
com1 at shb? port 0xa4000008 irq 12
diff -r 6e6e991a697f -r e7965ef5c557 sys/arch/mmeye/conf/MMEYE
--- a/sys/arch/mmeye/conf/MMEYE Mon Sep 13 15:50:01 1999 +0000
+++ b/sys/arch/mmeye/conf/MMEYE Mon Sep 13 16:26:17 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE,v 1.1 1999/09/13 10:30:49 itojun Exp $
+# $NetBSD: MMEYE,v 1.2 1999/09/13 16:26:18 msaitoh Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -65,10 +65,6 @@
shb* at mainbus?
-# mainbus pseudo floppy
-#fdc0 at mainbus0 # pseudo PC floppy controllers
-#fd0 at fdc0 drive 0
-
com0 at shb? port 0xa4000000 irq 11
com1 at shb? port 0xa4000008 irq 12
diff -r 6e6e991a697f -r e7965ef5c557 sys/arch/mmeye/conf/MMTA
--- a/sys/arch/mmeye/conf/MMTA Mon Sep 13 15:50:01 1999 +0000
+++ b/sys/arch/mmeye/conf/MMTA Mon Sep 13 16:26:17 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMTA,v 1.1 1999/09/13 10:30:49 itojun Exp $
+# $NetBSD: MMTA,v 1.2 1999/09/13 16:26:18 msaitoh Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -170,12 +170,6 @@
# Miscellaneous mass storage devices
-# mainbus pseudo floppy
-fdc0 at mainbus0 # pseudo PC floppy controllers
-#fd* at fdc? drive ? # the drives themselves
-# some machines need you to do this instead of fd*
-fd0 at fdc0 drive 0
-
# Network Interfaces
diff -r 6e6e991a697f -r e7965ef5c557 sys/arch/mmeye/conf/MMTAICE
--- a/sys/arch/mmeye/conf/MMTAICE Mon Sep 13 15:50:01 1999 +0000
+++ b/sys/arch/mmeye/conf/MMTAICE Mon Sep 13 16:26:17 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMTAICE,v 1.1 1999/09/13 10:30:49 itojun Exp $
+# $NetBSD: MMTAICE,v 1.2 1999/09/13 16:26:18 msaitoh Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -203,12 +203,6 @@
# Miscellaneous mass storage devices
-# mainbus pseudo floppy
-fdc0 at mainbus0 # pseudo PC floppy controllers
-#fd* at fdc? drive ? # the drives themselves
-# some machines need you to do this instead of fd*
-fd0 at fdc0 drive 0
-
# Network Interfaces
diff -r 6e6e991a697f -r e7965ef5c557 sys/arch/mmeye/conf/MMTANEW
--- a/sys/arch/mmeye/conf/MMTANEW Mon Sep 13 15:50:01 1999 +0000
+++ b/sys/arch/mmeye/conf/MMTANEW Mon Sep 13 16:26:17 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMTANEW,v 1.1 1999/09/13 10:30:49 itojun Exp $
+# $NetBSD: MMTANEW,v 1.2 1999/09/13 16:26:18 msaitoh Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -177,11 +177,6 @@
# Miscellaneous mass storage devices
-# mainbus pseudo floppy
-fdc0 at mainbus0 # pseudo PC floppy controllers
-#fd* at fdc? drive ? # the drives themselves
-# some machines need you to do this instead of fd*
-fd0 at fdc0 drive 0
# Network Interfaces
diff -r 6e6e991a697f -r e7965ef5c557 sys/arch/mmeye/conf/MMTAROMNEW
--- a/sys/arch/mmeye/conf/MMTAROMNEW Mon Sep 13 15:50:01 1999 +0000
+++ b/sys/arch/mmeye/conf/MMTAROMNEW Mon Sep 13 16:26:17 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMTAROMNEW,v 1.1 1999/09/13 10:30:49 itojun Exp $
+# $NetBSD: MMTAROMNEW,v 1.2 1999/09/13 16:26:19 msaitoh Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -179,11 +179,6 @@
# Miscellaneous mass storage devices
-# mainbus pseudo floppy
-#fdc0 at mainbus0 # pseudo PC floppy controllers
-#fd* at fdc? drive ? # the drives themselves
-# some machines need you to do this instead of fd*
-#fd0 at fdc0 drive 0
# Network Interfaces
diff -r 6e6e991a697f -r e7965ef5c557 sys/arch/mmeye/mmeye/conf.c
--- a/sys/arch/mmeye/mmeye/conf.c Mon Sep 13 15:50:01 1999 +0000
+++ b/sys/arch/mmeye/mmeye/conf.c Mon Sep 13 16:26:17 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.1 1999/09/13 10:31:02 itojun Exp $ */
+/* $NetBSD: conf.c,v 1.2 1999/09/13 16:26:19 msaitoh Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -40,8 +40,6 @@
#include "wd.h"
bdev_decl(wd);
bdev_decl(sw);
-#include "fdc.h"
-bdev_decl(fd);
#include "sd.h"
bdev_decl(sd);
#include "st.h"
@@ -61,7 +59,7 @@
{
bdev_disk_init(NWD,wd), /* 0: ST506/ESDI/IDE disk */
bdev_swap_init(1,sw), /* 1: swap pseudo-device */
- bdev_disk_init(NFDC,fd), /* 2: floppy diskette */
+ bdev_notdef(), /* 2 (was floppy diskette) */
bdev_notdef(), /* 3 (was QIC-02/QIC-36 tape) */
bdev_disk_init(NSD,sd), /* 4: SCSI disk */
bdev_tape_init(NST,st), /* 5: SCSI tape */
@@ -146,7 +144,7 @@
cdev_ptc_init(NPTY,ptc), /* 6: pseudo-tty master */
cdev_log_init(1,log), /* 7: /dev/klog */
cdev_tty_init(NCOM,com), /* 8: serial port */
- cdev_disk_init(NFDC,fd), /* 9: floppy disk */
+ cdev_notdef(), /* 9 (was floppy disk) */
cdev_notdef(), /* 10 (was QIC-02/QIC-36 tape) */
cdev_tty_init(NSCI,sci), /* 11: */
cdev_notdef(), /* 12: (was PC console) */
@@ -238,7 +236,7 @@
/* 6 */ NODEV,
/* 7 */ NODEV,
/* 8 */ NODEV,
- /* 9 */ 2,
+ /* 9 */ NODEV,
/* 10 */ NODEV,
/* 11 */ NODEV,
/* 12 */ NODEV,
diff -r 6e6e991a697f -r e7965ef5c557 sys/arch/sh3/conf/files.sh3
--- a/sys/arch/sh3/conf/files.sh3 Mon Sep 13 15:50:01 1999 +0000
+++ b/sys/arch/sh3/conf/files.sh3 Mon Sep 13 16:26:17 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.sh3,v 1.1 1999/09/13 10:31:07 itojun Exp $
+# $NetBSD: files.sh3,v 1.2 1999/09/13 16:26:19 msaitoh Exp $
#
# new style config file for sh3 architecture
#
@@ -62,14 +62,6 @@
attach mainbus at root
file arch/sh3/sh3/mainbus.c mainbus
-# Mainbus pseudo floppy disk controller
-device fdc {drive = -1}
-attach fdc at mainbus
-device fd: disk
-attach fd at fdc
-file arch/sh3/sh3/fd.c fdc needs-flag
-major {fd = 2}
-
#
# Compatibility modules
#
diff -r 6e6e991a697f -r e7965ef5c557 sys/arch/sh3/dev/fd.c
--- a/sys/arch/sh3/dev/fd.c Mon Sep 13 15:50:01 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1645 +0,0 @@
-/* $NetBSD: fd.c,v 1.1 1999/09/13 10:31:08 itojun Exp $ */
-
-/*-
- * Copyright (c) 1993, 1994, 1995, 1996
- * Charles M. Hannum. All rights reserved.
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Don Ahn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
Home |
Main Index |
Thread Index |
Old Index