From 4b1b51b1f88ba8ff2a175f56be6434025ebcb83d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Tue, 9 Oct 2012 14:00:28 -0400 Subject: [PATCH] channels: fix data type refactoring issue --- channels/audin/client/pulse/audin_pulse.c | 8 ++++---- channels/rdpsnd/client/pulse/rdpsnd_pulse.c | 6 +++--- channels/tsmf/client/pulse/tsmf_pulse.c | 6 +++--- channels/urbdrc/libusb/libusb_udevice.c | 2 +- channels/urbdrc/libusb/libusb_udevice.h | 17 ++++++----------- cunit/test_mppc.c | 4 ++-- 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/channels/audin/client/pulse/audin_pulse.c b/channels/audin/client/pulse/audin_pulse.c index 9797b275e..73f98925f 100644 --- a/channels/audin/client/pulse/audin_pulse.c +++ b/channels/audin/client/pulse/audin_pulse.c @@ -387,10 +387,10 @@ static void audin_pulse_open(IAudinDevice* device, AudinReceive receive, void* u audin_pulse_stream_state_callback, pulse); pa_stream_set_read_callback(pulse->stream, audin_pulse_stream_request_callback, pulse); - buffer_attr.maxlength = (UINT32_t) -1; - buffer_attr.tlength = (UINT32_t) -1; - buffer_attr.prebuf = (UINT32_t) -1; - buffer_attr.minreq = (UINT32_t) -1; + buffer_attr.maxlength = (UINT32) -1; + buffer_attr.tlength = (UINT32) -1; + buffer_attr.prebuf = (UINT32) -1; + buffer_attr.minreq = (UINT32) -1; /* 500ms latency */ buffer_attr.fragsize = pa_usec_to_bytes(500000, &pulse->sample_spec); if (pa_stream_connect_record(pulse->stream, diff --git a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c index 4710eb88f..38461e47e 100644 --- a/channels/rdpsnd/client/pulse/rdpsnd_pulse.c +++ b/channels/rdpsnd/client/pulse/rdpsnd_pulse.c @@ -288,9 +288,9 @@ static void rdpsnd_pulse_open(rdpsndDevicePlugin* device, rdpsndFormat* format, { buffer_attr.maxlength = pa_usec_to_bytes(pulse->latency * 2 * 1000, &pulse->sample_spec); buffer_attr.tlength = pa_usec_to_bytes(pulse->latency * 1000, &pulse->sample_spec); - buffer_attr.prebuf = (UINT32_t) -1; - buffer_attr.minreq = (UINT32_t) -1; - buffer_attr.fragsize = (UINT32_t) -1; + buffer_attr.prebuf = (UINT32) -1; + buffer_attr.minreq = (UINT32) -1; + buffer_attr.fragsize = (UINT32) -1; flags |= PA_STREAM_ADJUST_LATENCY; } diff --git a/channels/tsmf/client/pulse/tsmf_pulse.c b/channels/tsmf/client/pulse/tsmf_pulse.c index 08d776179..4d3bc35f2 100644 --- a/channels/tsmf/client/pulse/tsmf_pulse.c +++ b/channels/tsmf/client/pulse/tsmf_pulse.c @@ -243,9 +243,9 @@ static BOOL tsmf_pulse_open_stream(TSMFPulseAudioDevice* pulse) tsmf_pulse_stream_request_callback, pulse); buffer_attr.maxlength = pa_usec_to_bytes(500000, &pulse->sample_spec); buffer_attr.tlength = pa_usec_to_bytes(250000, &pulse->sample_spec); - buffer_attr.prebuf = (UINT32_t) -1; - buffer_attr.minreq = (UINT32_t) -1; - buffer_attr.fragsize = (UINT32_t) -1; + buffer_attr.prebuf = (UINT32) -1; + buffer_attr.minreq = (UINT32) -1; + buffer_attr.fragsize = (UINT32) -1; if (pa_stream_connect_playback(pulse->stream, pulse->device[0] ? pulse->device : NULL, &buffer_attr, PA_STREAM_ADJUST_LATENCY | PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE, diff --git a/channels/urbdrc/libusb/libusb_udevice.c b/channels/urbdrc/libusb/libusb_udevice.c index 894cd5a2a..f0c8f68b0 100644 --- a/channels/urbdrc/libusb/libusb_udevice.c +++ b/channels/urbdrc/libusb/libusb_udevice.c @@ -334,7 +334,7 @@ func_iso_data_init(ISO_USER_DATA * iso_user_data, UINT32 numPacket, UINT32 buffs static int -func_config_release_all_interface(LIBUSB_DEVICE_HANDLE *libusb_handle, UINT32_t NumInterfaces) +func_config_release_all_interface(LIBUSB_DEVICE_HANDLE *libusb_handle, UINT32 NumInterfaces) { int i, ret; for (i = 0; i < NumInterfaces; i++) diff --git a/channels/urbdrc/libusb/libusb_udevice.h b/channels/urbdrc/libusb/libusb_udevice.h index 5bf8ad529..5f8e9004b 100644 --- a/channels/urbdrc/libusb/libusb_udevice.h +++ b/channels/urbdrc/libusb/libusb_udevice.h @@ -29,18 +29,16 @@ #include "request_queue.h" #include "urbdrc_main.h" - - typedef struct libusb_device LIBUSB_DEVICE; typedef struct libusb_device_handle LIBUSB_DEVICE_HANDLE; typedef struct libusb_device_descriptor LIBUSB_DEVICE_DESCRIPTOR; typedef struct libusb_config_descriptor LIBUSB_CONFIG_DESCRIPTOR; -typedef struct libusb_interface LIBUSB_INTERFACE; -typedef struct libusb_interface_descriptor LIBUSB_INTERFACE_DESCRIPTOR; -typedef struct libusb_endpoint_descriptor LIBUSB_ENDPOINT_DESCEIPTOR; - +typedef struct libusb_interface LIBUSB_INTERFACE; +typedef struct libusb_interface_descriptor LIBUSB_INTERFACE_DESCRIPTOR; +typedef struct libusb_endpoint_descriptor LIBUSB_ENDPOINT_DESCEIPTOR; typedef struct _UDEVICE UDEVICE; + struct _UDEVICE { IUDEVICE iface; @@ -75,11 +73,8 @@ struct _UDEVICE }; typedef UDEVICE * PUDEVICE; - -int -udev_new_by_id(UINT16_t idVendor, UINT16_t idProduct, IUDEVICE ***devArray); -IUDEVICE* -udev_new_by_addr(int bus_number, int dev_number); +int udev_new_by_id(UINT16 idVendor, UINT16 idProduct, IUDEVICE ***devArray); +IUDEVICE* udev_new_by_addr(int bus_number, int dev_number); extern int libusb_debug; diff --git a/cunit/test_mppc.c b/cunit/test_mppc.c index 9c361c604..4ca57e00d 100644 --- a/cunit/test_mppc.c +++ b/cunit/test_mppc.c @@ -636,8 +636,8 @@ int add_mppc_suite(void) void test_mppc(void) { struct rdp_mppc_dec* rmppc; - UINT32_t roff; - UINT32_t rlen; + UINT32 roff; + UINT32 rlen; long int dur; struct timeval start_time;