Sun Jan 9 16:28:40 2011 UTC ()

Check if `enet' environment variable is available before reference to
get MAC address, and exit with appropriate warning messages if it isn't.
My 3MIN doesn't set the variable by default and netboot fails silently.
Also tidy up code that converts strings to enaddr.


(tsutsui)

diff -r1.7 -r1.8 src/sys/arch/pmax/stand/common/if_prom.c

--- src/sys/arch/pmax/stand/common/if_prom.c 2009/03/14 15:36:12	1.7
+++ src/sys/arch/pmax/stand/common/if_prom.c 2011/01/09 16:28:40	1.8

 @@ -1,14 +1,14 @@
-/*      $NetBSD: if_prom.c,v 1.7 2009/03/14 15:36:12 dsl Exp $ */
+/*      $NetBSD: if_prom.c,v 1.8 2011/01/09 16:28:40 tsutsui Exp $ */
 /* Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Gregory McGarry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -113,58 +113,69 @@ prom_probe(struct netif *nif, void *mach
 #ifdef NET_DEBUG
 	printf("prom_probe: called\n");
 #endif
 	return 0;
+}
 void
 prom_init(struct iodesc *desc, void *machdep_hint)
+{
 	char *device =
 		((struct netif *)desc->io_netif)->nif_driver->netif_bname;
-	char *c, *enet;
+	char *enet;
-	int i, j, num;
+	uint8_t *cp, *dest;
 	int i;
 #ifdef NET_DEBUG
 	printf("prom_init: called\n");
 #endif
 	try_bootp = 1;
 	/*
 	 * Get our hardware address (this prom call is one of the rare ones
          * which is the same for new and old proms)
          */
 	enet = (*callv->_getenv)("enet");
 	if (enet == NULL) {
 		printf("No `enet' environment variable found.\n"
 		    "Set MAC address to `enet' manually by setenv command.\n");
 		(*callv->_halt)((int *)0, 0);	/* XXX */
 		/* NOTREACHED */
+	}
 #ifdef NET_DEBUG
 	if (debug)
 		printf("enet=%s\n", enet);
 #endif
-	i=0;
+#define atox(c)	(((c) < '9') ? ((c) - '0') : ((toupper(c) - 'A') + 10))
 	c = enet;
-	for (i=0; i<6; i++) {
+	cp = (uint8_t *)enet;
-		j = *c - '0';
+	dest = desc->myea;
-		num = (j<10?j:j-39);
+	for (i = 0; i < 6; i++) {
-		num <<= 4;
+		if (isxdigit(*cp)) {
-		c++;
+			*dest = atox(*cp);
-		j = *c - '0';
+			cp++;
-		num += (j<10?j:j-39);
+			if (isxdigit(*cp)) {
-		desc->myea[i] = num;
+				*dest = (*dest << 4) | atox(*cp);
-		c++;
+				cp++;
 		c++; /* skip '-' */
+		}
 		dest++;
 		cp++;	/* skip '-' or ':' etc. */
+	}
 	desc->xid = 0x66d30000;
 	if (callv == &callvec)
 		sc_fd = prom_open(device, 0);
 	else
 		sc_fd = (*callv->_bootinit)(device);
 	if (sc_fd < 0)
 		printf("problem initialising device\n");
+}