Merge remote branch 'kwolf/for-anthony' into staging

[qemu.git] / hw / sd.h

diff --git a/hw/sd.h b/hw/sd.h
index ab20064fe0a245390c050db943585502b07afa67..ac4b7c4dfa2b0fd20a316634dc6f84e90334236e 100644 (file)
--- a/hw/sd.h
+++ b/hw/sd.h
@@ -29,8 +29,6 @@
 #ifndef __hw_sd_h
 #define __hw_sd_h              1
 
-#include <vl.h>
-
 #define OUT_OF_RANGE           (1 << 31)
 #define ADDRESS_ERROR          (1 << 30)
 #define BLOCK_LEN_ERROR                (1 << 29)
@@ -61,22 +59,21 @@ typedef enum {
     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;
-};
+} SDRequest;
 
 typedef struct SDState SDState;
 
-SDState *sd_init(BlockDriverState *bs);
-int sd_do_command(SDState *sd, struct sd_request_s *req,
+SDState *sd_init(BlockDriverState *bs, int 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, void *opaque,
-               void (*readonly_cb)(void *, int),
-               void (*inserted_cb)(void *, int));
+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);
 
 #endif /* __hw_sd_h */