From d368ba4376b2c1c24175c74b3733b8fe64dbe8a6 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Mon, 8 Dec 2014 18:10:30 -0500 Subject: sdhci: Remove class "virtual" methods The SDHCIClass defines a series of class "methods". However, no code in the QEMU tree overrides these methods or even uses them outside of sdhci.c. Remove the virtual methods and replace them with direct calls to the underlying functions. This simplifies the process of extending the sdhci code to support PCI devices (which have a different parent class). Signed-off-by: Kevin O'Connor Signed-off-by: Paolo Bonzini --- hw/sd/sdhci.h | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'hw/sd/sdhci.h') diff --git a/hw/sd/sdhci.h b/hw/sd/sdhci.h index a560c3c93f..9a334ac96f 100644 --- a/hw/sd/sdhci.h +++ b/hw/sd/sdhci.h @@ -279,34 +279,10 @@ typedef struct SDHCIState { /* RO Host Controller Version Register always reads as 0x2401 */ } SDHCIState; -typedef struct SDHCIClass { - SysBusDeviceClass busdev_class; - - void (*reset)(SDHCIState *s); - uint32_t (*mem_read)(SDHCIState *s, unsigned int offset, unsigned size); - void (*mem_write)(SDHCIState *s, unsigned int offset, uint32_t value, - unsigned size); - void (*send_command)(SDHCIState *s); - bool (*can_issue_command)(SDHCIState *s); - void (*data_transfer)(SDHCIState *s); - void (*end_data_transfer)(SDHCIState *s); - void (*do_sdma_single)(SDHCIState *s); - void (*do_sdma_multi)(SDHCIState *s); - void (*do_adma)(SDHCIState *s); - void (*read_block_from_card)(SDHCIState *s); - void (*write_block_to_card)(SDHCIState *s); - uint32_t (*bdata_read)(SDHCIState *s, unsigned size); - void (*bdata_write)(SDHCIState *s, uint32_t value, unsigned size); -} SDHCIClass; - extern const VMStateDescription sdhci_vmstate; #define TYPE_SDHCI "generic-sdhci" #define SDHCI(obj) \ OBJECT_CHECK(SDHCIState, (obj), TYPE_SDHCI) -#define SDHCI_CLASS(klass) \ - OBJECT_CLASS_CHECK(SDHCIClass, (klass), TYPE_SDHCI) -#define SDHCI_GET_CLASS(obj) \ - OBJECT_GET_CLASS(SDHCIClass, (obj), TYPE_SDHCI) #endif /* SDHCI_H */ -- cgit v1.2.3