Module Name: src
Committed By: tsutsui
Date: Sun Jan 13 04:39:28 UTC 2013
Modified Files:
src/sys/arch/luna68k/stand/boot: device.h sc.c sd.c
Log Message:
Remove unused function members from struct driver.
This makes adding other drivers easier.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/device.h \
src/sys/arch/luna68k/stand/boot/sc.c src/sys/arch/luna68k/stand/boot/sd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/stand/boot/device.h
diff -u src/sys/arch/luna68k/stand/boot/device.h:1.1 src/sys/arch/luna68k/stand/boot/device.h:1.2
--- src/sys/arch/luna68k/stand/boot/device.h:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/device.h Sun Jan 13 04:39:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: device.h,v 1.2 2013/01/13 04:39:28 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -73,10 +73,7 @@
struct driver {
int (*d_init)(void *);
char *d_name;
- int (*d_start)(void);
- int (*d_go)(void);
int (*d_intr)(void);
- int (*d_done)(void);
};
struct hp_ctlr {
Index: src/sys/arch/luna68k/stand/boot/sc.c
diff -u src/sys/arch/luna68k/stand/boot/sc.c:1.1 src/sys/arch/luna68k/stand/boot/sc.c:1.2
--- src/sys/arch/luna68k/stand/boot/sc.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/sc.c Sun Jan 13 04:39:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sc.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: sc.c,v 1.2 2013/01/13 04:39:28 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -96,12 +96,9 @@ static void ixfer_in(struct scsidevice *
static int scrun(int, int, u_char *, int, u_char *, int, volatile int *);
static int scfinish(int);
static void scabort(struct scsi_softc *, struct scsidevice *);
-static int scstart(void);
-static int scgo(void);
-static int scdone(void);
struct driver scdriver = {
- scinit, "sc", scstart, scgo, scintr, scdone
+ scinit, "sc", scintr,
};
struct scsi_softc scsi_softc[NSC];
@@ -523,32 +520,6 @@ scsi_format_unit(int ctlr, int slave, in
/*
- * ????
- */
-
-int
-scstart(void)
-{
-
- return 0;
-}
-
-int
-scgo(void)
-{
-
- return 0;
-}
-
-int
-scdone(void)
-{
-
- return 0;
-}
-
-
-/*
* Interrupt Routine
*/
Index: src/sys/arch/luna68k/stand/boot/sd.c
diff -u src/sys/arch/luna68k/stand/boot/sd.c:1.1 src/sys/arch/luna68k/stand/boot/sd.c:1.2
--- src/sys/arch/luna68k/stand/boot/sd.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/sd.c Sun Jan 13 04:39:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: sd.c,v 1.2 2013/01/13 04:39:28 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -106,13 +106,10 @@ struct sd_devdata {
};
static int sdinit(void *);
-static int sdstart(void);
-static int sdgo(void);
-static int sdintr(void);
static int sdident(struct sd_softc *, struct hp_device *);
struct driver sddriver = {
- sdinit, "sd", sdstart, sdgo, sdintr,
+ sdinit, "sd", NULL,
};
struct sd_softc sd_softc[NSD];
@@ -364,27 +361,6 @@ sdstrategy(void *devdata, int func, dadd
return 0;
}
-int
-sdstart(void)
-{
-
- return 0;
-}
-
-int
-sdgo(void)
-{
-
- return 0;
-}
-
-int
-sdintr(void)
-{
-
- return 0;
-}
-
#if 0
int
sdread(dev_t dev, u_int blk, u_int nblk, u_char *buff, u_int len)
