diff options
Diffstat (limited to 'sys/arch/luna88k/stand/boot/boot.c')
| -rw-r--r-- | sys/arch/luna88k/stand/boot/boot.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/sys/arch/luna88k/stand/boot/boot.c b/sys/arch/luna88k/stand/boot/boot.c index cd6cb3ba650..60f47c7fda4 100644 --- a/sys/arch/luna88k/stand/boot/boot.c +++ b/sys/arch/luna88k/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.1 2013/10/28 22:13:12 miod Exp $ */ +/* $OpenBSD: boot.c,v 1.2 2013/10/29 18:51:37 miod Exp $ */ /* $NetBSD: boot.c,v 1.3 2013/03/05 15:34:53 tsutsui Exp $ */ /* @@ -85,12 +85,15 @@ int howto; +#if 0 static int get_boot_device(const char *, int *, int *, int *); +#endif void (*cpu_boot)(uint32_t, uint32_t); uint32_t cpu_bootarg1; uint32_t cpu_bootarg2; +#if 0 int get_boot_device(const char *s, int *devp, int *unitp, int *partp) { @@ -103,14 +106,17 @@ get_boot_device(const char *s, int *devp, int *unitp, int *partp) p++; } - while (*++p != ',') { + p++; + for (; *p != ',' && *p != ')'; p++) { if (*p == '\0') goto error; if (*p >= '0' && *p <= '9') unit = (unit * 10) + (*p - '0'); } - while (*++p != ')') { + if (*p == ',') + p++; + for (; *p != ')'; p++) { if (*p == '\0') goto error; if (*p >= '0' && *p <= '9') @@ -126,6 +132,7 @@ get_boot_device(const char *s, int *devp, int *unitp, int *partp) error: return -1; } +#endif int boot(int argc, char *argv[]) @@ -146,13 +153,17 @@ int bootunix(char *line) { int io; +#if 0 int dev, unit, part; +#endif u_long marks[MARK_MAX]; +#if 0 if (get_boot_device(line, &dev, &unit, &part) != 0) { printf("Bad file name %s\n", line); return ST_ERROR; } +#endif /* Note marks[MARK_START] is passed as an load address offset */ memset(marks, 0, sizeof(marks)); |