Or is there some reason I don't know about that isp16 should work
differently from all the others?
(also note the patch comments out some Config.in sections instead of
deleting them)
tz@execpc.com
finger tz@execpc.com for PGP key
diff -BburN x2133/drivers/block/ll_rw_blk.c l2133/drivers/block/ll_rw_blk.c
--- x2133/drivers/block/ll_rw_blk.c Tue Mar 18 17:13:45 1997
+++ l2133/drivers/block/ll_rw_blk.c Tue Apr 15 22:20:50 1997
@@ -662,9 +662,9 @@
#ifdef CONFIG_BLK_DEV_LOOP
loop_init();
#endif
-#ifdef CONFIG_CDI_INIT
- cdi_init(); /* this MUST precede ide_init */
-#endif CONFIG_CDI_INIT
+#ifdef CONFIG_ISP16_CDI
+ isp16_init();
+#endif CONFIG_ISP16_CDI
#ifdef CONFIG_BLK_DEV_IDE
ide_init(); /* this MUST precede hd_init */
#endif
diff -BburN x2133/drivers/cdrom/Config.in l2133/drivers/cdrom/Config.in
--- x2133/drivers/cdrom/Config.in Wed Dec 18 08:57:28 1996
+++ l2133/drivers/cdrom/Config.in Tue Apr 15 22:12:42 1997
@@ -19,9 +19,9 @@
tristate 'Optics Storage DOLPHIN 8000AT CDROM support' CONFIG_OPTCD
tristate 'Philips/LMS CM206 CDROM support' CONFIG_CM206
tristate 'Sanyo CDR-H94A CDROM support' CONFIG_SJCD
-bool 'Soft configurable cdrom interface card support' CONFIG_CDI_INIT
-if [ "$CONFIG_CDI_INIT" = "y" ]; then
+#bool 'Soft configurable cdrom interface card support' CONFIG_CDI_INIT
+#if [ "$CONFIG_CDI_INIT" = "y" ]; then
tristate 'ISP16/MAD16/Mozart soft configurable cdrom interface support' CONFIG_ISP16_CDI
-fi
+#fi
tristate 'Sony CDU31A/CDU33A CDROM support' CONFIG_CDU31A
tristate 'Sony CDU535 CDROM support' CONFIG_CDU535
diff -BburN x2133/drivers/cdrom/Makefile l2133/drivers/cdrom/Makefile
--- x2133/drivers/cdrom/Makefile Wed Dec 18 08:57:28 1996
+++ l2133/drivers/cdrom/Makefile Tue Apr 15 22:15:48 1997
@@ -122,9 +122,9 @@
endif
endif #CONFIG_BPCD
-ifeq ($(CONFIG_CDI_INIT),y)
-L_OBJS += cdi.o
-endif #CONFIG_CDI_INIT
+#ifeq ($(CONFIG_CDI_INIT),y)
+#L_OBJS += cdi.o
+#endif #CONFIG_CDI_INIT
ifeq ($(CONFIG_ISP16_CDI),y)
L_OBJS += isp16.o
else
diff -BburN x2133/drivers/cdrom/cdi.c l2133/drivers/cdrom/cdi.c
--- x2133/drivers/cdrom/cdi.c Tue Feb 13 03:30:25 1996
+++ l2133/drivers/cdrom/cdi.c Wed Dec 31 19:00:00 1969
@@ -1,49 +0,0 @@
-/* -- cdi.c
- *
- * Initialisation of software configurable cdrom interface
- * cards goes here.
- *
- * Copyright (c) 1996 Eric van der Maarel <H.T.M.v.d.Maarel@marin.nl>
- *
- * Version 0.1
- *
- * History:
- * 0.1 First release. Only support for ISP16/MAD16/Mozart.
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <linux/config.h>
-#include <linux/blk.h> /* where the proto type of cdi_init() is */
-#ifdef CONFIG_ISP16_CDI
-#include <linux/isp16.h>
-#endif CONFIG_ISP16_CDI
-
-/*
- * Cdrom interface configuration.
- */
-int
-cdi_init(void)
-{
- int ret_val = -1;
-
-#ifdef CONFIG_ISP16_CDI
- ret_val &= isp16_init();
-#endif CONFIG_ISP16_CDI
-
- return(ret_val);
-}
-
diff -BburN x2133/include/linux/blk.h l2133/include/linux/blk.h
--- x2133/include/linux/blk.h Thu Apr 10 02:31:37 1997
+++ l2133/include/linux/blk.h Tue Apr 15 22:20:57 1997
@@ -70,9 +70,9 @@
#ifdef CONFIG_SJCD
extern int sjcd_init(void);
#endif CONFIG_SJCD
-#ifdef CONFIG_CDI_INIT
-extern int cdi_init(void);
-#endif CONFIG_CDI_INIT
+#ifdef CONFIG_ISP16_CDI
+extern int isp16_init(void);
+#endif CONFIG_ISP16_CDI
#ifdef CONFIG_BLK_DEV_HD
extern int hd_init(void);
#endif