diff options
author | Alon Levy <alevy@redhat.com> | 2011-02-03 17:33:37 +0200 |
---|---|---|
committer | Alon Levy <alevy@redhat.com> | 2011-02-10 10:20:49 +0200 |
commit | efa3704dbc5352fadff4c7547664c5d3aaa9cba1 (patch) | |
tree | f9699d0056f7d486cce8921559690388f029ac52 /server | |
parent | 9de4c94a5d608b764965c30e77b84116a42e1525 (diff) | |
download | spice-efa3704dbc5352fadff4c7547664c5d3aaa9cba1.tar.gz spice-efa3704dbc5352fadff4c7547664c5d3aaa9cba1.tar.xz spice-efa3704dbc5352fadff4c7547664c5d3aaa9cba1.zip |
server/smartcard: s/reader_id_t/uint32_t/ (libcacard changed)
Diffstat (limited to 'server')
-rw-r--r-- | server/smartcard.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/server/smartcard.c b/server/smartcard.c index 7c0a5aaf..63e4a99b 100644 --- a/server/smartcard.c +++ b/server/smartcard.c @@ -7,7 +7,7 @@ typedef struct SmartCardDeviceState { SpiceCharDeviceState base; - reader_id_t reader_id; + uint32_t reader_id; uint32_t attached; uint8_t *buf; uint32_t buf_size; @@ -23,7 +23,7 @@ enum { typedef struct ErrorItem { PipeItem base; - reader_id_t reader_id; + uint32_t reader_id; uint32_t error; } ErrorItem; @@ -49,7 +49,7 @@ static struct Readers { } g_smartcard_readers = {0, {NULL}}; static SpiceCharDeviceInstance* smartcard_readers_get_unattached(); -static SpiceCharDeviceInstance* smartcard_readers_get(reader_id_t reader_id); +static SpiceCharDeviceInstance* smartcard_readers_get(uint32_t reader_id); static int smartcard_char_device_add_to_readers(SpiceCharDeviceInstance *sin); static void smartcard_char_device_attach( SpiceCharDeviceInstance *char_device, SmartCardChannel *smartcard_channel); @@ -150,7 +150,7 @@ static int smartcard_char_device_add_to_readers(SpiceCharDeviceInstance *char_de return 0; } -static SpiceCharDeviceInstance *smartcard_readers_get(reader_id_t reader_id) +static SpiceCharDeviceInstance *smartcard_readers_get(uint32_t reader_id) { ASSERT(reader_id < g_smartcard_readers.num); return g_smartcard_readers.sin[reader_id]; @@ -358,7 +358,7 @@ static void smartcard_channel_pipe_add(SmartCardChannel *channel, PipeItem *item red_channel_pipe_add(&channel->base, item); } -static void smartcard_push_error(SmartCardChannel* channel, reader_id_t reader_id, VSCErrorCode error) +static void smartcard_push_error(SmartCardChannel* channel, uint32_t reader_id, VSCErrorCode error) { ErrorItem *error_item = spice_new0(ErrorItem, 1); @@ -392,7 +392,7 @@ void smartcard_on_message_from_device(SmartCardChannel *smartcard_channel, smartcard_push_vscmsg(smartcard_channel, vheader); } -static void smartcard_remove_reader(SmartCardChannel *smartcard_channel, reader_id_t reader_id) +static void smartcard_remove_reader(SmartCardChannel *smartcard_channel, uint32_t reader_id) { SpiceCharDeviceInstance *char_device = smartcard_readers_get(reader_id); SmartCardDeviceState *state; |