rtoss - Diff between revs 78 and 79

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 78 Rev 79
Line 372... Line 372...
372     int is_cf; 372     int is_cf;
373     int cylinders, heads, sectors; 373     int cylinders, heads, sectors;
374     int64_t nb_sectors; 374     int64_t nb_sectors;
375     int mult_sectors; 375     int mult_sectors;
376     int identify_set; 376     int identify_set;
377     uint16_t identify_data[256]; -  
-   377     uint8_t identify_data[512];
378     int drive_serial; 378     int drive_serial;
379     char drive_serial_str[21]; 379     char drive_serial_str[21];
380     /* ide regs */ 380     /* ide regs */
381     uint8_t feature; 381     uint8_t feature;
382     uint8_t error; 382     uint8_t error;
Line 511... Line 511...
511         qemu_irq_raise(bus->irq); 511         qemu_irq_raise(bus->irq);
512     } 512     }
513 } 513 }
514 514
515 /* hw/ide/core.c */ 515 /* hw/ide/core.c */
516 void ide_save(QEMUFile* f, IDEState *s); -  
517 void ide_load(QEMUFile* f, IDEState *s, int version_id); -  
518 void idebus_save(QEMUFile* f, IDEBus *bus); -  
519 void idebus_load(QEMUFile* f, IDEBus *bus, int version_id); -  
-   516 extern const VMStateDescription vmstate_ide_bus;
-   517
-   518 #define VMSTATE_IDE_BUS(_field, _state)                          \
-   519     VMSTATE_STRUCT(_field, _state, 1, vmstate_ide_bus, IDEBus)
-   520
-   521 #define VMSTATE_IDE_BUS_ARRAY(_field, _state, _num)              \
-   522     VMSTATE_STRUCT_ARRAY(_field, _state, _num, 1, vmstate_ide_bus, IDEBus)
-   523
-   524 extern const VMStateDescription vmstate_ide_drive;
-   525
-   526 #define VMSTATE_IDE_DRIVES(_field, _state) \
-   527     VMSTATE_STRUCT_ARRAY(_field, _state, 2, 3, vmstate_ide_drive, IDEState)
520 528
521 void ide_reset(IDEState *s); 529 void ide_reset(IDEState *s);
522 int64_t ide_get_sector(IDEState *s); 530 int64_t ide_get_sector(IDEState *s);
523 void ide_set_sector(IDEState *s, int64_t sector_num); 531 void ide_set_sector(IDEState *s, int64_t sector_num);
524 532