projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/nchip/public_html/qemu into garage-push
[qemu]
/
hw
/
sd.h
diff --git
a/hw/sd.h
b/hw/sd.h
index
cb7bc9c
..
ac4b7c4
100644
(file)
--- a/
hw/sd.h
+++ b/
hw/sd.h
@@
-59,16
+59,16
@@
typedef enum {
sd_adtc, /* addressed with data transfer */
} sd_cmd_type_t;
sd_adtc, /* addressed with data transfer */
} sd_cmd_type_t;
-struct sd_request_s {
+typedef struct {
uint8_t cmd;
uint32_t arg;
uint8_t crc;
uint8_t cmd;
uint32_t arg;
uint8_t crc;
-};
+} SDRequest;
typedef struct SDState SDState;
SDState *sd_init(BlockDriverState *bs, int is_spi);
typedef struct SDState SDState;
SDState *sd_init(BlockDriverState *bs, int is_spi);
-int sd_do_command(SDState *sd, struct sd_request_s *req,
+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);
uint8_t *response);
void sd_write_data(SDState *sd, uint8_t value);
uint8_t sd_read_data(SDState *sd);
@@
-76,8
+76,4
@@
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);
int sd_data_ready(SDState *sd);
void sd_enable(SDState *sd, int enable);
-/* ssi-sd.c */
-int ssi_sd_xfer(void *opaque, int val);
-void *ssi_sd_init(BlockDriverState *bs);
-
#endif /* __hw_sd_h */
#endif /* __hw_sd_h */