diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-13 15:59:11 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-13 15:59:11 -0500 |
| commit | 6a1f9d0c1fbf186d3d68cb2af43d047637c93072 (patch) | |
| tree | c29a01bc5b8351277c0e424bcc4206ba42e06a50 /hw/sd.h | |
| parent | d517872ec289f5bfa6bd9f385a90e09483e9949c (diff) | |
| parent | 58f9b98f8a341c8b7bb0c9b38e492a01fe71d666 (diff) | |
| download | focaccia-qemu-6a1f9d0c1fbf186d3d68cb2af43d047637c93072.tar.gz focaccia-qemu-6a1f9d0c1fbf186d3d68cb2af43d047637c93072.zip | |
Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging
* pmaydell/arm-devs.next: arm: Move some ARM devices into libhw ssd0323: abort() instead of exit(1) on error. hw/sd.c: make sd_wp_addr() return bool hw/sd.c: make sd_dataready() return bool hw/sd.c: convert binary variables to bool hw/sd.c: introduce wrapper for conversion address to wp group hw/sd.c: make sd_wp_addr() accept 64 bit address argument hw/sd.c: convert wp_groups in SDState to bitfield armv7m: Guard against no -kernel argument hw/armv7m_nvic: Fix incorrect default for num-irqs property
Diffstat (limited to 'hw/sd.h')
| -rw-r--r-- | hw/sd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/sd.h b/hw/sd.h index ac4b7c4dfa..4eb9679acd 100644 --- a/hw/sd.h +++ b/hw/sd.h @@ -67,13 +67,13 @@ typedef struct { typedef struct SDState SDState; -SDState *sd_init(BlockDriverState *bs, int is_spi); +SDState *sd_init(BlockDriverState *bs, bool is_spi); int sd_do_command(SDState *sd, SDRequest *req, uint8_t *response); void sd_write_data(SDState *sd, uint8_t value); uint8_t sd_read_data(SDState *sd); void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert); -int sd_data_ready(SDState *sd); -void sd_enable(SDState *sd, int enable); +bool sd_data_ready(SDState *sd); +void sd_enable(SDState *sd, bool enable); #endif /* __hw_sd_h */ |