diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2003-10-31 04:08:11 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2003-10-31 04:08:11 +0000 |
| commit | e0b7d7330aa098483a3edf29c54691aa6730395b (patch) | |
| tree | f0c85f54253af0f7e4f01408b6535ba0ea8b3a56 /sys/dev/ofw | |
| parent | e80d9462d294d452ecdcd5999f57bb51c225e243 (diff) | |
cleanup some OF bits, macppc specific bits in ofbus.c and with broken
firmware OF_exit() can return.
Diffstat (limited to 'sys/dev/ofw')
| -rw-r--r-- | sys/dev/ofw/ofbus.c | 9 | ||||
| -rw-r--r-- | sys/dev/ofw/openfirm.h | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sys/dev/ofw/ofbus.c b/sys/dev/ofw/ofbus.c index 50d2614734e..033cf010af5 100644 --- a/sys/dev/ofw/ofbus.c +++ b/sys/dev/ofw/ofbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofbus.c,v 1.12 2002/03/14 01:26:58 millert Exp $ */ +/* $OpenBSD: ofbus.c,v 1.13 2003/10/31 04:08:10 drahn Exp $ */ /* $NetBSD: ofbus.c,v 1.3 1996/10/13 01:38:11 christos Exp $ */ /* @@ -167,9 +167,6 @@ ofbprobe(parent, cf, aux) return 1; } -#ifdef __powerpc__ -void uni_n_config(int); -#endif /* __powerpc__ */ void ofbattach(parent, dev, aux) struct device *parent, *dev; @@ -206,10 +203,6 @@ ofbattach(parent, dev, aux) units = 2; #endif -#ifdef __powerpc__ - } else if (!strcmp(name, "uni-n")) { - uni_n_config(ofp->phandle); -#endif /* __powerpc__ */ } } for (child = OF_child(ofp->phandle); child; child = OF_peer(child)) { diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h index 33e257b7133..25e46815abf 100644 --- a/sys/dev/ofw/openfirm.h +++ b/sys/dev/ofw/openfirm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: openfirm.h,v 1.7 2002/03/14 03:16:06 millert Exp $ */ +/* $OpenBSD: openfirm.h,v 1.8 2003/10/31 04:08:10 drahn Exp $ */ /* $NetBSD: openfirm.h,v 1.1 1996/09/30 16:35:10 ws Exp $ */ /* @@ -59,7 +59,7 @@ void OF_close(int handle); int OF_read(int handle, void *addr, int len); int OF_write(int handle, void *addr, int len); int OF_seek(int handle, u_quad_t pos); -void OF_boot(char *bootspec) __attribute__((__noreturn__)); +void OF_boot(char *bootspec); void OF_enter(void); void OF_exit(void) __attribute__((__noreturn__)); int OF_interpret(char *cmd, int nreturns, ...); |