Author: ian
Date: Mon Feb 18 15:09:19 2019
New Revision: 344254
URL: https://svnweb.freebsd.org/changeset/base/344254
Log:
Use DEV_TYP_NONE instead of -1 to indicate no device was specified.
DEV_TYP_NONE has a value of zero, which makes more sense since the device
type is a bunch of bits describing the device, crammed into an int.
Modified:
head/stand/uboot/common/main.c
Modified: head/stand/uboot/common/main.c
==============================================================================
--- head/stand/uboot/common/main.c Mon Feb 18 14:21:41 2019
(r344253)
+++ head/stand/uboot/common/main.c Mon Feb 18 15:09:19 2019
(r344254)
@@ -156,7 +156,7 @@ get_device_type(const char *devstr, int *devtype)
printf("Unknown device type '%s'\n", devstr);
}
- *devtype = -1;
+ *devtype = DEV_TYP_NONE;
return (NULL);
}
@@ -202,7 +202,7 @@ get_load_device(int *type, int *unit, int *slice, int
const char *p;
char *endp;
- *type = -1;
+ *type = DEV_TYP_NONE;
*unit = -1;
*slice = 0;
*partition = -1;
@@ -467,14 +467,14 @@ main(int argc, char **argv)
currdev.dd.d_dev = devsw[i];
currdev.dd.d_unit = 0;
- if ((load_type == -1 || (load_type & DEV_TYP_STOR)) &&
+ if ((load_type == DEV_TYP_NONE || (load_type & DEV_TYP_STOR)) &&
strcmp(devsw[i]->dv_name, "disk") == 0) {
if (probe_disks(i, load_type, load_unit, load_slice,
load_partition) == 0)
break;
}
- if ((load_type == -1 || (load_type & DEV_TYP_NET)) &&
+ if ((load_type == DEV_TYP_NONE || (load_type & DEV_TYP_NET)) &&
strcmp(devsw[i]->dv_name, "net") == 0)
break;
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
