motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 09:43:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging

Browse source 
* remotes/mcayland/qemu-sparc:
  sun4m: Add Sun CG3 framebuffer initialisation function
  sun4m: Add Sun CG3 framebuffer and corresponding OpenBIOS FCode ROM
  sun4m: fix slavio timer RUN/STOP bit
  sun4m: Set HostID in NVRAM

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-03-04 13:09:06 +00:00
commit d47e95c0c8
11 changed files with 486 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/hw/nvram/openbios_firmware_abi.h
View file

@ -62,6 +62,8 @@ Sun_init_header(struct Sun_nvram *header, const uint8_t *macaddr, int machine_id
header->type = 1;
header->machine_id = machine_id & 0xff;
memcpy(&header->macaddr, macaddr, 6);
memcpy(&header->hostid , &macaddr[3], 3);
/* Calculate checksum */
tmp = 0;
tmpptr = (uint8_t *)header;

1
include/sysemu/sysemu.h
View file

@ -104,6 +104,7 @@ extern int autostart;
typedef enum {
VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL,
VGA_TCX, VGA_CG3,
} VGAInterfaceType;
extern int vga_interface_type;