motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/sd/omap_mmc: Convert remaining 'struct omap_mmc_s' uses to OMAPMMCState

Browse source 
Mechanically convert the remaining uses of 'struct omap_mmc_s' to
'OMAPMMCState'.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250128104519.3981448-3-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Peter Maydell 2025-01-28 10:45:10 +00:00 • committed by Philippe Mathieu-Daudé
parent 4cadcb6b5f
commit 408ccf5fd6
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hw/sd/omap_mmc.c
View file

@ -27,7 +27,7 @@
#include "hw/arm/omap.h" #include "hw/arm/omap.h"
#include "hw/sd/sdcard_legacy.h" #include "hw/sd/sdcard_legacy.h"
typedef struct omap_mmc_s { typedef struct OMAPMMCState {
SysBusDevice parent_obj; SysBusDevice parent_obj;
qemu_irq irq; qemu_irq irq;
@ -72,12 +72,12 @@ typedef struct omap_mmc_s {
qemu_irq cdet; qemu_irq cdet;
} OMAPMMCState; } OMAPMMCState;
static void omap_mmc_interrupts_update(struct omap_mmc_s *s) static void omap_mmc_interrupts_update(OMAPMMCState *s)
{ {
qemu_set_irq(s->irq, !!(s->status & s->mask)); qemu_set_irq(s->irq, !!(s->status & s->mask));
} }
static void omap_mmc_fifolevel_update(struct omap_mmc_s *host) static void omap_mmc_fifolevel_update(OMAPMMCState *host)
{ {
if (!host->transfer && !host->fifo_len) { if (!host->transfer && !host->fifo_len) {
host->status &= 0xf3ff; host->status &= 0xf3ff;
@ -125,7 +125,7 @@ typedef enum {
SD_TYPE_ADTC = 3, /* addressed with data transfer */ SD_TYPE_ADTC = 3, /* addressed with data transfer */
} MMCCmdType; } MMCCmdType;
static void omap_mmc_command(struct omap_mmc_s *host, int cmd, int dir, static void omap_mmc_command(OMAPMMCState *host, int cmd, int dir,
MMCCmdType type, int busy, MMCCmdType type, int busy,
sd_rsp_type_t resptype, int init) sd_rsp_type_t resptype, int init)
{ {
@ -234,7 +234,7 @@ static void omap_mmc_command(struct omap_mmc_s *host, int cmd, int dir,
host->status |= 0x0001; host->status |= 0x0001;
} }
static void omap_mmc_transfer(struct omap_mmc_s *host) static void omap_mmc_transfer(OMAPMMCState *host)
{ {
uint8_t value; uint8_t value;
@ -289,19 +289,19 @@ static void omap_mmc_transfer(struct omap_mmc_s *host)
static void omap_mmc_update(void *opaque) static void omap_mmc_update(void *opaque)
{ {
struct omap_mmc_s *s = opaque; OMAPMMCState *s = opaque;
omap_mmc_transfer(s); omap_mmc_transfer(s);
omap_mmc_fifolevel_update(s); omap_mmc_fifolevel_update(s);
omap_mmc_interrupts_update(s); omap_mmc_interrupts_update(s);
} }
static void omap_mmc_pseudo_reset(struct omap_mmc_s *host) static void omap_mmc_pseudo_reset(OMAPMMCState *host)
{ {
host->status = 0; host->status = 0;
host->fifo_len = 0; host->fifo_len = 0;
} }
static void omap_mmc_reset(struct omap_mmc_s *host) static void omap_mmc_reset(OMAPMMCState *host)
{ {
host->last_cmd = 0; host->last_cmd = 0;
memset(host->rsp, 0, sizeof(host->rsp)); memset(host->rsp, 0, sizeof(host->rsp));
@ -340,7 +340,7 @@ static void omap_mmc_reset(struct omap_mmc_s *host)
static uint64_t omap_mmc_read(void *opaque, hwaddr offset, unsigned size) static uint64_t omap_mmc_read(void *opaque, hwaddr offset, unsigned size)
{ {
uint16_t i; uint16_t i;
struct omap_mmc_s *s = opaque; OMAPMMCState *s = opaque;
if (size != 2) { if (size != 2) {
return omap_badwidth_read16(opaque, offset); return omap_badwidth_read16(opaque, offset);
@ -433,7 +433,7 @@ static void omap_mmc_write(void *opaque, hwaddr offset,
uint64_t value, unsigned size) uint64_t value, unsigned size)
{ {
int i; int i;
struct omap_mmc_s *s = opaque; OMAPMMCState *s = opaque;
if (size != 2) { if (size != 2) {
omap_badwidth_write16(opaque, offset, value); omap_badwidth_write16(opaque, offset, value);

2
include/hw/arm/omap.h
View file

@ -530,7 +530,7 @@ struct omap_lcd_panel_s *omap_lcdc_init(MemoryRegion *sysmem,
/* omap_mmc.c */ /* omap_mmc.c */
#define TYPE_OMAP_MMC "omap-mmc" #define TYPE_OMAP_MMC "omap-mmc"
OBJECT_DECLARE_SIMPLE_TYPE(omap_mmc_s, OMAP_MMC) OBJECT_DECLARE_SIMPLE_TYPE(OMAPMMCState, OMAP_MMC)
DeviceState *omap_mmc_init(hwaddr base, DeviceState *omap_mmc_init(hwaddr base,
MemoryRegion *sysmem, MemoryRegion *sysmem,