Revision 1d914fa0 hw/pc.c

b/hw/pc.c
34 34
#include "loader.h"
35 35
#include "elf.h"
36 36
#include "multiboot.h"
37
#include "mc146818rtc.h"
37 38

  
38 39
/* output Bochs bios info messages */
39 40
//#define DEBUG_BIOS
......
192 193
}
193 194

  
194 195
static void cmos_init_hd(int type_ofs, int info_ofs, BlockDriverState *hd,
195
                         RTCState *s)
196
                         ISADevice *s)
196 197
{
197 198
    int cylinders, heads, sectors;
198 199
    bdrv_get_geometry_hint(hd, &cylinders, &heads, &sectors);
......
225 226
    return 0;
226 227
}
227 228

  
228
static int set_boot_dev(RTCState *s, const char *boot_device, int fd_bootchk)
229
static int set_boot_dev(ISADevice *s, const char *boot_device, int fd_bootchk)
229 230
{
230 231
#define PC_MAX_BOOT_DEVICES 3
231 232
    int nbds, bds[3] = { 0, };
......
257 258
/* hd_table must contain 4 block drivers */
258 259
void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
259 260
                  const char *boot_device, DriveInfo **hd_table,
260
                  FDCtrl *floppy_controller, RTCState *s)
261
                  FDCtrl *floppy_controller, ISADevice *s)
261 262
{
262 263
    int val;
263 264
    int fd0, fd1, nb;
......
752 753
   BIOS will read it and start S3 resume at POST Entry */
753 754
void pc_cmos_set_s3_resume(void *opaque, int irq, int level)
754 755
{
755
    RTCState *s = opaque;
756
    ISADevice *s = opaque;
756 757

  
757 758
    if (level) {
758 759
        rtc_set_memory(s, 0xF, 0xFE);
......
929 930

  
930 931
void pc_basic_device_init(qemu_irq *isa_irq,
931 932
                          FDCtrl **floppy_controller,
932
                          RTCState **rtc_state)
933
                          ISADevice **rtc_state)
933 934
{
934 935
    int i;
935 936
    DriveInfo *fd[MAX_FD];

Also available in: Unified diff