david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ide: remove uselsess casts from void *

Browse Source 
Patchworks-ID: 35298
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-10-07 16:56:21 +02:00 committed by Anthony Liguori
parent edcca5a3b8
commit 18c0fb307c
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/ide/microdrive.c
View File

@ -94,7 +94,7 @@ static inline void md_interrupt_update(MicroDriveState *s)
static void md_set_irq(void *opaque, int irq, int level) static void md_set_irq(void *opaque, int irq, int level)
{ {
MicroDriveState *s = (MicroDriveState *) opaque; MicroDriveState *s = opaque;
if (level) if (level)
s->stat |= STAT_INT; s->stat |= STAT_INT;
else else
@ -115,7 +115,7 @@ static void md_reset(MicroDriveState *s)
static uint8_t md_attr_read(void *opaque, uint32_t at) static uint8_t md_attr_read(void *opaque, uint32_t at)
{ {
MicroDriveState *s = (MicroDriveState *) opaque; MicroDriveState *s = opaque;
if (at < s->attr_base) { if (at < s->attr_base) {
if (at < s->card.cis_len) if (at < s->card.cis_len)
return s->card.cis[at]; return s->card.cis[at];
@ -148,7 +148,7 @@ static uint8_t md_attr_read(void *opaque, uint32_t at)
static void md_attr_write(void *opaque, uint32_t at, uint8_t value) static void md_attr_write(void *opaque, uint32_t at, uint8_t value)
{ {
MicroDriveState *s = (MicroDriveState *) opaque; MicroDriveState *s = opaque;
at -= s->attr_base; at -= s->attr_base;
switch (at) { switch (at) {
@ -179,7 +179,7 @@ static void md_attr_write(void *opaque, uint32_t at, uint8_t value)
static uint16_t md_common_read(void *opaque, uint32_t at) static uint16_t md_common_read(void *opaque, uint32_t at)
{ {
MicroDriveState *s = (MicroDriveState *) opaque; MicroDriveState *s = opaque;
IDEState *ifs; IDEState *ifs;
uint16_t ret; uint16_t ret;
at -= s->io_base; at -= s->io_base;
@ -241,7 +241,7 @@ static uint16_t md_common_read(void *opaque, uint32_t at)
static void md_common_write(void *opaque, uint32_t at, uint16_t value) static void md_common_write(void *opaque, uint32_t at, uint16_t value)
{ {
MicroDriveState *s = (MicroDriveState *) opaque; MicroDriveState *s = opaque;
at -= s->io_base; at -= s->io_base;
switch (s->opt & OPT_MODE) { switch (s->opt & OPT_MODE) {
@ -302,7 +302,7 @@ static void md_common_write(void *opaque, uint32_t at, uint16_t value)
static void md_save(QEMUFile *f, void *opaque) static void md_save(QEMUFile *f, void *opaque)
{ {
MicroDriveState *s = (MicroDriveState *) opaque; MicroDriveState *s = opaque;
int i; int i;
qemu_put_8s(f, &s->opt); qemu_put_8s(f, &s->opt);
@ -321,7 +321,7 @@ static void md_save(QEMUFile *f, void *opaque)
static int md_load(QEMUFile *f, void *opaque, int version_id) static int md_load(QEMUFile *f, void *opaque, int version_id)
{ {
MicroDriveState *s = (MicroDriveState *) opaque; MicroDriveState *s = opaque;
int i; int i;
if (version_id != 0 && version_id != 3) if (version_id != 0 && version_id != 3)
@ -530,7 +530,7 @@ static const uint8_t dscm1xxxx_cis[0x14a] = {
static int dscm1xxxx_attach(void *opaque) static int dscm1xxxx_attach(void *opaque)
{ {
MicroDriveState *md = (MicroDriveState *) opaque; MicroDriveState *md = opaque;
md->card.attr_read = md_attr_read; md->card.attr_read = md_attr_read;
md->card.attr_write = md_attr_write; md->card.attr_write = md_attr_write;
md->card.common_read = md_common_read; md->card.common_read = md_common_read;
@ -550,7 +550,7 @@ static int dscm1xxxx_attach(void *opaque)
static int dscm1xxxx_detach(void *opaque) static int dscm1xxxx_detach(void *opaque)
{ {
MicroDriveState *md = (MicroDriveState *) opaque; MicroDriveState *md = opaque;
md_reset(md); md_reset(md);
return 0; return 0;
} }

8
hw/ide/mmio.c
View File

@ -43,7 +43,7 @@ typedef struct {
static uint32_t mmio_ide_read (void *opaque, target_phys_addr_t addr) static uint32_t mmio_ide_read (void *opaque, target_phys_addr_t addr)
{ {
MMIOState *s = (MMIOState*)opaque; MMIOState *s = opaque;
IDEBus *bus = s->bus; IDEBus *bus = s->bus;
addr >>= s->shift; addr >>= s->shift;
if (addr & 7) if (addr & 7)
@ -55,7 +55,7 @@ static uint32_t mmio_ide_read (void *opaque, target_phys_addr_t addr)
static void mmio_ide_write (void *opaque, target_phys_addr_t addr, static void mmio_ide_write (void *opaque, target_phys_addr_t addr,
uint32_t val) uint32_t val)
{ {
MMIOState *s = (MMIOState*)opaque; MMIOState *s = opaque;
IDEBus *bus = s->bus; IDEBus *bus = s->bus;
addr >>= s->shift; addr >>= s->shift;
if (addr & 7) if (addr & 7)
@ -78,7 +78,7 @@ static CPUWriteMemoryFunc * const mmio_ide_writes[] = {
static uint32_t mmio_ide_status_read (void *opaque, target_phys_addr_t addr) static uint32_t mmio_ide_status_read (void *opaque, target_phys_addr_t addr)
{ {
MMIOState *s= (MMIOState*)opaque; MMIOState *s= opaque;
IDEBus *bus = s->bus; IDEBus *bus = s->bus;
return ide_status_read(bus, 0); return ide_status_read(bus, 0);
} }
@ -86,7 +86,7 @@ static uint32_t mmio_ide_status_read (void *opaque, target_phys_addr_t addr)
static void mmio_ide_cmd_write (void *opaque, target_phys_addr_t addr, static void mmio_ide_cmd_write (void *opaque, target_phys_addr_t addr,
uint32_t val) uint32_t val)
{ {
MMIOState *s = (MMIOState*)opaque; MMIOState *s = opaque;
IDEBus *bus = s->bus; IDEBus *bus = s->bus;
ide_cmd_write(bus, 0, val); ide_cmd_write(bus, 0, val);
} }