CVS commit: src/sys/arch/x86

[David Young]

Module Name:    src
Committed By:   dyoung
Date:           Wed Aug 19 15:04:27 UTC 2009

Modified Files:
        src/sys/arch/x86/include: isa_machdep.h
        src/sys/arch/x86/isa: isa_machdep.c

Log Message:
isa_detach_hook() needs two arguments, the first an isa_chipset_tag_t.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/include/isa_machdep.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/isa/isa_machdep.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/x86/include/isa_machdep.h
diff -u src/sys/arch/x86/include/isa_machdep.h:1.9 src/sys/arch/x86/include/isa_machdep.h:1.10
--- src/sys/arch/x86/include/isa_machdep.h:1.9	Tue Aug 18 17:02:00 2009
+++ src/sys/arch/x86/include/isa_machdep.h	Wed Aug 19 15:04:27 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.9 2009/08/18 17:02:00 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.10 2009/08/19 15:04:27 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
  */
 void	isa_attach_hook(device_t, device_t,
 	    struct isabus_attach_args *);
-void	isa_detach_hook(device_t);
+void	isa_detach_hook(isa_chipset_tag_t, device_t);
 int	isa_intr_alloc(isa_chipset_tag_t, int, int, int *);
 const struct evcnt *isa_intr_evcnt(isa_chipset_tag_t ic, int irq);
 void	*isa_intr_establish(isa_chipset_tag_t ic, int irq, int type,

Index: src/sys/arch/x86/isa/isa_machdep.c
diff -u src/sys/arch/x86/isa/isa_machdep.c:1.27 src/sys/arch/x86/isa/isa_machdep.c:1.28
--- src/sys/arch/x86/isa/isa_machdep.c:1.27	Tue Aug 18 17:02:00 2009
+++ src/sys/arch/x86/isa/isa_machdep.c	Wed Aug 19 15:04:27 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.27 2009/08/18 17:02:00 dyoung Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.28 2009/08/19 15:04:27 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.27 2009/08/18 17:02:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.28 2009/08/19 15:04:27 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -291,7 +291,7 @@
 }
 
 void
-isa_detach_hook(device_t self)
+isa_detach_hook(isa_chipset_tag_t ic, device_t self)
 {
 	extern int isa_has_been_seen;