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
/
pcmcia.h
diff --git
a/hw/pcmcia.h
b/hw/pcmcia.h
index
290a76f
..
7171504
100644
(file)
--- a/
hw/pcmcia.h
+++ b/
hw/pcmcia.h
@@
-2,20
+2,20
@@
#include "qemu-common.h"
#include "qemu-common.h"
-struct pcmcia_socket_s {
+typedef struct {
qemu_irq irq;
int attached;
const char *slot_string;
const char *card_string;
qemu_irq irq;
int attached;
const char *slot_string;
const char *card_string;
-};
+} PCMCIASocket;
-void pcmcia_socket_register(struct pcmcia_socket_s *socket);
-void pcmcia_socket_unregister(struct pcmcia_socket_s *socket);
+void pcmcia_socket_register(PCMCIASocket *socket);
+void pcmcia_socket_unregister(PCMCIASocket *socket);
void pcmcia_info(Monitor *mon);
void pcmcia_info(Monitor *mon);
-struct pcmcia_card_s {
+struct PCMCIACardState {
void *state;
void *state;
- struct pcmcia_socket_s *slot;
+ PCMCIASocket *slot;
int (*attach)(void *state);
int (*detach)(void *state);
const uint8_t *cis;
int (*attach)(void *state);
int (*detach)(void *state);
const uint8_t *cis;
@@
-48,4
+48,4
@@
struct pcmcia_card_s {
#define CISTPL_ENDMARK 0xff
/* dscm1xxxx.c */
#define CISTPL_ENDMARK 0xff
/* dscm1xxxx.c */
-struct pcmcia_card_s *dscm1xxxx_init(BlockDriverState *bdrv);
+PCMCIACardState *dscm1xxxx_init(BlockDriverState *bdrv);