Page MenuHomeFreeBSD
Files F151159641

D6466.id16620.diff
No OneTemporary
Actions

D6466.id16620.diff
View Options

Index: sys/dev/nvram2env/nvram2env.c
===================================================================
--- sys/dev/nvram2env/nvram2env.c
+++ sys/dev/nvram2env/nvram2env.c
@@ -193,10 +193,12 @@
static int
nvram2env_attach(device_t dev)
{
- struct nvram2env_softc * sc = device_get_softc(dev);
- struct nvram * nv;
+ struct nvram2env_softc *sc;
+ struct nvram *nv;
char *pair, *value, *assign;
- uint32_t sig, size, i;
+ uint32_t sig, size, i, *tmp;
+
+ sc = device_get_softc(dev);
if (sc->bst == 0 || sc->addr == 0)
return (ENXIO);
@@ -217,16 +219,22 @@
if (sig == sc->sig || (sc->flags & NVRAM_FLAGS_UBOOT))
{
- /* align and shift size to 32bit size*/
+ /* align size to 32bit size*/
size += 3;
- size >>= 2;
+ size &= ~3;
- nv = malloc(size<<2, M_DEVBUF, M_WAITOK | M_ZERO);
+ nv = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO);
if (!nv)
return (ENOMEM);
+ /* set tmp pointer to begin of NVRAM */
+ tmp = (uint32_t *) nv;
- for (i = 0; i < size; i ++)
- ((uint32_t *)nv)[i] = read_4(sc, i<<2);
+ /* use read_4 to swap bytes if it's required */
+ for (i = 0; i < size; i += 4) {
+ *tmp = read_4(sc, i);
+ tmp++;
+ }
+ /* now tmp pointer is end of NVRAM */
if (sc->flags & NVRAM_FLAGS_BROADCOM) {
device_printf(dev, "sig = %#x\n", nv->sig);
@@ -246,49 +254,47 @@
else
pair = (char*)nv+4;
- for ( ;
- (u_int32_t)pair < ((u_int32_t)nv + size - 4);
- pair = pair + strlen(pair) + 1 + strlen(value) + 1 ) {
+ /* iterate over buffer till end. tmp points to end of NVRAM */
+ for ( ; pair < (char*)tmp;
+ pair += strlen(pair) + strlen(value) + 2 ) {
- if (pair && strlen(pair)) {
+ if (!pair || (strlen(pair) == 0))
+ break;
-#if 0
- printf("ENV: %s\n", pair);
-#endif
- /* hint.nvram.0. */
- assign = strchr(pair,'=');
- assign[0] = '\0';
- value = assign+1;
+ /* hint.nvram.0. */
+ assign = strchr(pair,'=');
+ assign[0] = '\0';
+ value = assign+1;
#if 1
- if (bootverbose)
- printf("ENV: %s=%s\n", pair, value);
+ if (bootverbose)
+ printf("ENV: %s=%s\n", pair, value);
+#else
+ printf("ENV: %s\n", pair);
#endif
- kern_setenv(pair, value);
-
- if (strcasecmp(pair, "WAN_MAC_ADDR") == 0) {
- /* Alias for MAC address of eth0 */
- if (bootverbose)
- printf("ENV: aliasing "
- "WAN_MAC_ADDR to ethaddr"
- " = %s\n", value);
- kern_setenv("ethaddr", value);
- }
- else if (strcasecmp(pair, "LAN_MAC_ADDR") == 0){
- /* Alias for MAC address of eth1 */
- if (bootverbose)
- printf("ENV: aliasing "
- "LAN_MAC_ADDR to eth1addr"
- " = %s\n", value);
- kern_setenv("eth1addr", value);
- }
-
- if (strcmp(pair, "bootverbose") == 0)
- bootverbose = strtoul(value, 0, 0);
- if (strcmp(pair, "boothowto" ) == 0)
- boothowto = strtoul(value, 0, 0);
+ kern_setenv(pair, value);
+
+ if (strcasecmp(pair, "WAN_MAC_ADDR") == 0) {
+ /* Alias for MAC address of eth0 */
+ if (bootverbose)
+ printf("ENV: aliasing "
+ "WAN_MAC_ADDR to ethaddr"
+ " = %s\n", value);
+ kern_setenv("ethaddr", value);
}
- else
- break;
+ else if (strcasecmp(pair, "LAN_MAC_ADDR") == 0){
+ /* Alias for MAC address of eth1 */
+ if (bootverbose)
+ printf("ENV: aliasing "
+ "LAN_MAC_ADDR to eth1addr"
+ " = %s\n", value);
+ kern_setenv("eth1addr", value);
+ }
+
+ if (strcmp(pair, "bootverbose") == 0)
+ bootverbose = strtoul(value, 0, 0);
+ if (strcmp(pair, "boothowto" ) == 0)
+ boothowto = strtoul(value, 0, 0);
+
}
free(nv, M_DEVBUF);
}

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 12:26 PM (3 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31030302
Default Alt Text
D6466.id16620.diff (3 KB)

Event Timeline