Revision 428c149b hw/ide/internal.h

b/hw/ide/internal.h
7 7
 * non-internal declarations are in hw/ide.h
8 8
 */
9 9
#include <hw/ide.h>
10
#include "block_int.h"
10 11

  
11 12
/* debug IDE devices */
12 13
//#define DEBUG_IDE
......
397 398
    /* set for lba48 access */
398 399
    uint8_t lba48;
399 400
    BlockDriverState *bs;
401
    BlockConf *conf;
400 402
    char version[9];
401 403
    /* ATAPI specific */
402 404
    uint8_t sense_key;
......
449 451
struct IDEDevice {
450 452
    DeviceState qdev;
451 453
    uint32_t unit;
452
    DriveInfo *dinfo;
454
    BlockConf conf;
453 455
    char *version;
454 456
};
455 457

  
......
551 553
void ide_data_writel(void *opaque, uint32_t addr, uint32_t val);
552 554
uint32_t ide_data_readl(void *opaque, uint32_t addr);
553 555

  
554
void ide_init_drive(IDEState *s, DriveInfo *dinfo, const char *version);
556
void ide_init_drive(IDEState *s, DriveInfo *dinfo, BlockConf *conf,
557
    const char *version);
555 558
void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1,
556 559
               qemu_irq irq);
557 560
void ide_init_ioport(IDEBus *bus, int iobase, int iobase2);

Also available in: Unified diff