Commit 3161906d authored by John Snow's avatar John Snow
Browse files

hw/ide: Remove duplicated definitions from ahci_internal.h 



The same definitions can also be found in include/hw/ide/ahci.h
so let's remove these #defines from ahci_internal.h.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-id: 1512457825-3847-1-git-send-email-thuth@redhat.com
[Maintainer edit: publicize object names, privatize object macros.]
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 947858b0

hw/ide/ahci_internal.h

+0 −4
Original line number Diff line number Diff line
@@ -311,8 +311,6 @@ struct AHCIPCIState { 
    AHCIState ahci;

};



#define TYPE_ICH9_AHCI "ich9-ahci"



#define ICH_AHCI(obj) \

    OBJECT_CHECK(AHCIPCIState, (obj), TYPE_ICH9_AHCI)
@@ -375,10 +373,8 @@ void ahci_uninit(AHCIState *s); 


void ahci_reset(AHCIState *s);



#define TYPE_SYSBUS_AHCI "sysbus-ahci"

#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI)



#define TYPE_ALLWINNER_AHCI "allwinner-ahci"

#define ALLWINNER_AHCI(obj) OBJECT_CHECK(AllwinnerAHCIState, (obj), \

                       TYPE_ALLWINNER_AHCI)

include/hw/ide/ahci.h

+0 −6
Original line number Diff line number Diff line
@@ -54,14 +54,10 @@ typedef struct AHCIPCIState AHCIPCIState; 


#define TYPE_ICH9_AHCI "ich9-ahci"



#define ICH_AHCI(obj) \

    OBJECT_CHECK(AHCIPCIState, (obj), TYPE_ICH9_AHCI)



int32_t ahci_get_num_ports(PCIDevice *dev);

void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd);



#define TYPE_SYSBUS_AHCI "sysbus-ahci"

#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI)



typedef struct SysbusAHCIState {

    /*< private >*/
@@ -73,8 +69,6 @@ typedef struct SysbusAHCIState { 
} SysbusAHCIState;



#define TYPE_ALLWINNER_AHCI "allwinner-ahci"

#define ALLWINNER_AHCI(obj) OBJECT_CHECK(AllwinnerAHCIState, (obj), \

                       TYPE_ALLWINNER_AHCI)



#define ALLWINNER_AHCI_MMIO_OFF  0x80

#define ALLWINNER_AHCI_MMIO_SIZE 0x80