On Dec 16, 2018, at 9:38 AM, Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost> wrote:
so I'll put the similar change for the sti console code:
---
Index: hp300/autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp300/hp300/autoconf.c,v
retrieving revision 1.105
diff -u -p -d -r1.105 autoconf.c
--- hp300/autoconf.c 20 Apr 2014 04:12:54 -0000 1.105
+++ hp300/autoconf.c 16 Dec 2018 17:22:08 -0000
@@ -152,6 +152,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#endif
#if NSTI_SGC > 0
+#include <hp300/dev/sgcreg.h>
#include <hp300/dev/sgcvar.h>
#include <hp300/dev/sti_sgcvar.h>
#endif
@@ -838,13 +839,17 @@ hp300_cninit(void)
machineid == HP_433) {
struct bus_space_tag sgc_tag;
bus_space_tag_t sgc_bst;
+ u_int slot;
sgc_bst = &sgc_tag;
memset(sgc_bst, 0, sizeof(struct bus_space_tag));
sgc_bst->bustype = HP300_BUS_SPACE_SGC;
- if (sti_sgc_cnprobe(sgc_bst, sgc_slottopa(0), 0)) {
- cninit_deferred = true;
- goto find_kbd;
+ for (slot = 0; slot < SGC_NSLOTS; slot++) {
+ if (sti_sgc_cnprobe(sgc_bst, sgc_slottopa(slot),
+ slot)) {
+ cninit_deferred = true;
+ goto find_kbd;
+ }
}
}
#endif
---
This works fine on my HP425e:
To work on my 425t it’ll also need an equivalent change in hp300_cninit_deferred(void) but with that I expect it will work just fine. I should be able to give it a try sometime this week.
Thanks!
-- Chris
|