[Qemu-devel] [4870] Add idprom

[Blue Swirl]

Revision: 4870
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4870
Author:   blueswir1
Date:     2008-07-15 14:54:01 +0000 (Tue, 15 Jul 2008)

Log Message:
-----------
Add idprom

Modified Paths:
--------------
    trunk/hw/sun4u.c

Modified: trunk/hw/sun4u.c
===================================================================
--- trunk/hw/sun4u.c    2008-07-15 14:52:09 UTC (rev 4869)
+++ trunk/hw/sun4u.c    2008-07-15 14:54:01 UTC (rev 4870)
@@ -98,7 +98,8 @@
                                    const char *cmdline,
                                    uint32_t initrd_image, uint32_t initrd_size,
                                    uint32_t NVRAM_image,
-                                   int width, int height, int depth)
+                                   int width, int height, int depth,
+                                   const uint8_t *macaddr)
 {
     unsigned int i;
     uint32_t start, end;
@@ -172,6 +173,8 @@
     end = 0x1fd0;
     OpenBIOS_finish_partition(part_header, end - start);
 
+    Sun_init_header((struct Sun_nvram *)&image[0x1fd8], macaddr, 0x80);
+
     for (i = 0; i < sizeof(image); i++)
         m48t59_write(nvram, i, image[i]);
 
@@ -396,12 +399,13 @@
     floppy_controller = fdctrl_init(NULL/*6*/, 2, 0, 0x3f0, fd);
     nvram = m48t59_init(NULL/*8*/, 0, 0x0074, NVRAM_SIZE, 59);
     sun4u_NVRAM_set_params(nvram, NVRAM_SIZE, "Sun4u", RAM_size, boot_devices,
-                         KERNEL_LOAD_ADDR, kernel_size,
-                         kernel_cmdline,
-                         INITRD_LOAD_ADDR, initrd_size,
-                         /* XXX: need an option to load a NVRAM image */
-                         0,
-                         graphic_width, graphic_height, graphic_depth);
+                           KERNEL_LOAD_ADDR, kernel_size,
+                           kernel_cmdline,
+                           INITRD_LOAD_ADDR, initrd_size,
+                           /* XXX: need an option to load a NVRAM image */
+                           0,
+                           graphic_width, graphic_height, graphic_depth,
+                           (uint8_t *)&nd_table[0].macaddr);
 
 }