Browse Source

Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe

tags/v0.9.3
Michael Brown 17 years ago
parent
commit
6855c357a5
2 changed files with 1 additions and 4 deletions
  1. 1
    2
      src/drivers/net/natsemi.c
  2. 0
    2
      src/drivers/net/natsemi.h

+ 1
- 2
src/drivers/net/natsemi.c View File

332
          * With PME set the chip will scan incoming packets but
332
          * With PME set the chip will scan incoming packets but
333
          * nothing will be written to memory. 
333
          * nothing will be written to memory. 
334
          */
334
          */
335
-        SavedClkRun = inl (np->ioaddr + ClkRun);
336
-        outl (SavedClkRun & ~0x100, np->ioaddr + ClkRun);
335
+        outl (inl (np->ioaddr + ClkRun) & ~0x100, np->ioaddr + ClkRun);
337
 
336
 
338
 	/* Set MAC address in NIC
337
 	/* Set MAC address in NIC
339
 	 */
338
 	 */

+ 0
- 2
src/drivers/net/natsemi.h View File

182
   MICRIntEn               = 0x2,
182
   MICRIntEn               = 0x2,
183
 };
183
 };
184
 
184
 
185
-static uint32_t SavedClkRun;	
186
-
187
 /* CFG bits [13:16] [18:23] */
185
 /* CFG bits [13:16] [18:23] */
188
 #define CFG_RESET_SAVE 0xfde000
186
 #define CFG_RESET_SAVE 0xfde000
189
 /* WCSR bits [0:4] [9:10] */
187
 /* WCSR bits [0:4] [9:10] */

Loading…
Cancel
Save