diff options
author | grehan <grehan@FreeBSD.org> | 2003-12-21 12:38:25 +0000 |
---|---|---|
committer | grehan <grehan@FreeBSD.org> | 2003-12-21 12:38:25 +0000 |
commit | 696ff2b7c46e68d5a59e617640777f37bc63899b (patch) | |
tree | 04bd886c0f64a23a89977b8a308f239dbbfc6107 /sys/boot/ofw | |
parent | 92ec82003e0da7bd834607efeae899f084e05d2f (diff) | |
download | FreeBSD-src-696ff2b7c46e68d5a59e617640777f37bc63899b.zip FreeBSD-src-696ff2b7c46e68d5a59e617640777f37bc63899b.tar.gz |
- Add ':' as a separator between the OpenFirmware device space and
the file path. Commonly used on Macs e.g. "hd:9".
- Update the ofw_setcurrdev routine to match libstand setenv prototype
Not objected to by: sparc64
Diffstat (limited to 'sys/boot/ofw')
-rw-r--r-- | sys/boot/ofw/libofw/devicename.c | 5 | ||||
-rw-r--r-- | sys/boot/ofw/libofw/libofw.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/boot/ofw/libofw/devicename.c b/sys/boot/ofw/libofw/devicename.c index 14a6058..9811743 100644 --- a/sys/boot/ofw/libofw/devicename.c +++ b/sys/boot/ofw/libofw/devicename.c @@ -47,7 +47,8 @@ ofw_getdev(void **vdev, const char *devspec, const char **path) * device, go with the current device. */ if ((devspec == NULL) || - (strchr(devspec, '@') == NULL)) { + ((strchr(devspec, '@') == NULL) && + (strchr(devspec, ':') == NULL))) { if (((rv = ofw_parsedev(dev, getenv("currdev"), NULL)) == 0) && (path != NULL)) @@ -112,7 +113,7 @@ found: } int -ofw_setcurrdev(struct env_var *ev, int flags, void *value) +ofw_setcurrdev(struct env_var *ev, int flags, const void *value) { struct ofw_devdesc *ncurr; int rv; diff --git a/sys/boot/ofw/libofw/libofw.h b/sys/boot/ofw/libofw/libofw.h index a7d73e6..9440a2e 100644 --- a/sys/boot/ofw/libofw/libofw.h +++ b/sys/boot/ofw/libofw/libofw.h @@ -36,7 +36,7 @@ struct ofw_devdesc { }; extern int ofw_getdev(void **vdev, const char *devspec, const char **path); -extern int ofw_setcurrdev(struct env_var *ev, int flags, void *value); +extern ev_sethook_t ofw_setcurrdev; extern struct devsw ofwdisk; extern struct netif_driver ofwnet; |