diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-02-27 22:10:59 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-02-27 22:10:59 +0000 |
| commit | fdf96c61d4c3a370ccfd6070ea95f94a74939913 (patch) | |
| tree | 4dfce55b9fcc21c99e9e5c3df78a0be67cb61d60 /sys/arch/hppa | |
| parent | 4c4273242ff4be0268af0dbbc44d6920ee9b9b9b (diff) | |
Split sti softc in two structures, one device-related for regular device
attachment and interface, one screen-attached for the real work.
The attachment code is now required to decide whether sti_end_attach() is
run immediately, or as a startuphook.
This allows hp300 to initialize sti early, and use it as a console; hppa
is functionally unchanged, as it uses the PROM console until the root device
is mounted.
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/dev/sti_sgc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/hppa/dev/sti_sgc.c b/sys/arch/hppa/dev/sti_sgc.c index 171731f129e..fc5ea07f505 100644 --- a/sys/arch/hppa/dev/sti_sgc.c +++ b/sys/arch/hppa/dev/sti_sgc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sti_sgc.c,v 1.25 2005/01/23 16:53:19 miod Exp $ */ +/* $OpenBSD: sti_sgc.c,v 1.26 2005/02/27 22:10:57 miod Exp $ */ /* * Copyright (c) 2000-2003 Michael Shalayeff @@ -224,11 +224,12 @@ sti_sgc_attach(parent, self, aux) } } - /* PCXL2: enale accel i/o for this space */ + /* PCXL2: enable accel i/o for this space */ if (cpu_type == hpcxl2) eaio_l2(0x8 >> (((ca->ca_hpa >> 25) & 3) - 2)); if (ca->ca_hpa == (hppa_hpa_t)PAGE0->mem_cons.pz_hpa) sc->sc_flags |= STI_CONSOLE; sti_attach_common(sc, STI_CODEBASE_PA); + startuphook_establish(sti_end_attach, sc); } |