Module Name: src
Committed By: tsutsui
Date: Tue Sep 8 18:31:36 UTC 2009
Modified Files:
src/sys/dev/sbus: esp_sbus.c if_le_lebuffer.c if_le_ledma.c
Log Message:
sbus_establish() should take device_t self for the device itself,
not device_t parent even if sbus is grandparent of the device,
otherwise (*sd_reset)() callbacks will be called with an wrong device_t.
Even in such case, sbus_establish() looks for an sbus though device tree.
XXX: (*sd_reset)() isn't called anyway, and these stuff seems really bogus.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/sbus/esp_sbus.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/sbus/if_le_lebuffer.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/sbus/if_le_ledma.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/dev/sbus/esp_sbus.c
diff -u src/sys/dev/sbus/esp_sbus.c:1.49 src/sys/dev/sbus/esp_sbus.c:1.50
--- src/sys/dev/sbus/esp_sbus.c:1.49 Tue Sep 8 18:15:17 2009
+++ src/sys/dev/sbus/esp_sbus.c Tue Sep 8 18:31:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_sbus.c,v 1.49 2009/09/08 18:15:17 tsutsui Exp $ */
+/* $NetBSD: esp_sbus.c,v 1.50 2009/09/08 18:31:36 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.49 2009/09/08 18:15:17 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.50 2009/09/08 18:31:36 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -408,9 +408,9 @@
esc->sc_pri = sa->sa_pri;
- /* Assume SBus is grandparent */
+ /* SBus is grandparent, but sbus_establish() looks for it properly */
esc->sc_sd.sd_reset = esp_sbus_reset;
- sbus_establish(&esc->sc_sd, parent);
+ sbus_establish(&esc->sc_sd, self);
espattach(esc, &esp_sbus_glue);
}
Index: src/sys/dev/sbus/if_le_lebuffer.c
diff -u src/sys/dev/sbus/if_le_lebuffer.c:1.25 src/sys/dev/sbus/if_le_lebuffer.c:1.26
--- src/sys/dev/sbus/if_le_lebuffer.c:1.25 Tue Sep 8 18:15:17 2009
+++ src/sys/dev/sbus/if_le_lebuffer.c Tue Sep 8 18:31:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_lebuffer.c,v 1.25 2009/09/08 18:15:17 tsutsui Exp $ */
+/* $NetBSD: if_le_lebuffer.c,v 1.26 2009/09/08 18:31:36 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.25 2009/09/08 18:15:17 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.26 2009/09/08 18:31:36 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -175,9 +175,9 @@
sc->sc_conf3 = prom_getpropint(sa->sa_node, "busmaster-regval",
LE_C3_BSWP | LE_C3_ACON | LE_C3_BCON);
- /* Assume SBus is grandparent */
+ /* SBus is grandparent, but sbus_establish() looks for it properly */
lesc->sc_sd.sd_reset = le_lebuffer_reset;
- sbus_establish(&lesc->sc_sd, parent);
+ sbus_establish(&lesc->sc_sd, self);
sc->sc_supmedia = lemedia;
sc->sc_nsupmedia = NLEMEDIA;
Index: src/sys/dev/sbus/if_le_ledma.c
diff -u src/sys/dev/sbus/if_le_ledma.c:1.32 src/sys/dev/sbus/if_le_ledma.c:1.33
--- src/sys/dev/sbus/if_le_ledma.c:1.32 Tue Sep 8 18:15:17 2009
+++ src/sys/dev/sbus/if_le_ledma.c Tue Sep 8 18:31:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_ledma.c,v 1.32 2009/09/08 18:15:17 tsutsui Exp $ */
+/* $NetBSD: if_le_ledma.c,v 1.33 2009/09/08 18:31:36 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.32 2009/09/08 18:15:17 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.33 2009/09/08 18:31:36 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -391,9 +391,9 @@
sc->sc_conf3 = LE_C3_BSWP | LE_C3_ACON | LE_C3_BCON;
lesc->sc_lostcount = 0;
- /* Assume SBus is grandparent */
+ /* SBus is grandparent, but sbus_establish looks for it properly */
lesc->sc_sd.sd_reset = le_ledma_reset;
- sbus_establish(&lesc->sc_sd, parent);
+ sbus_establish(&lesc->sc_sd, self);
sc->sc_mediachange = lemediachange;
sc->sc_mediastatus = lemediastatus;
