summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2008-12-10 09:11:43 +0000
committerMichael Sevakis <jethead71@rockbox.org>2008-12-10 09:11:43 +0000
commitf2f394793c31ad87d629116f03b277227394407a (patch)
tree568c2a8db5d33032bb3bfbc8f86d3fa6ae876616
parent8cfbd3604fac14f629244e521ad24ffa9938c790 (diff)
downloadrockbox-f2f394793c31ad87d629116f03b277227394407a.tar.gz
rockbox-f2f394793c31ad87d629116f03b277227394407a.zip
Fix red and a couple other things I somehow missed.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19378 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/pcmbuf.c2
-rw-r--r--apps/recorder/pcm_record.c2
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/mc13783-imx31.c2
-rw-r--r--firmware/usb.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 9ca5fbf5cf..695dfc55dc 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -115,7 +115,7 @@ static bool pcmbuf_flush;
115static int codec_thread_priority = PRIORITY_PLAYBACK; 115static int codec_thread_priority = PRIORITY_PLAYBACK;
116#endif 116#endif
117 117
118extern uintptr_t codec_thread_id; 118extern unsigned int codec_thread_id;
119 119
120/* Helpful macros for use in conditionals this assumes some of the above 120/* Helpful macros for use in conditionals this assumes some of the above
121 * static variable names */ 121 * static variable names */
diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c
index 9ceb68c796..8642150b18 100644
--- a/apps/recorder/pcm_record.c
+++ b/apps/recorder/pcm_record.c
@@ -37,7 +37,7 @@
37 37
38/***************************************************************************/ 38/***************************************************************************/
39 39
40extern uintptr_t codec_thread_id; 40extern unsigned int codec_thread_id;
41 41
42/** General recording state **/ 42/** General recording state **/
43static bool is_recording; /* We are recording */ 43static bool is_recording; /* We are recording */
diff --git a/firmware/target/arm/imx31/gigabeat-s/mc13783-imx31.c b/firmware/target/arm/imx31/gigabeat-s/mc13783-imx31.c
index 81849d0852..22987abf74 100644
--- a/firmware/target/arm/imx31/gigabeat-s/mc13783-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/mc13783-imx31.c
@@ -159,7 +159,7 @@ void mc13783_init(void)
159#ifdef PMIC_DRIVER_CLOSE 159#ifdef PMIC_DRIVER_CLOSE
160void mc13783_close(void) 160void mc13783_close(void)
161{ 161{
162 unsigned int thread_id = mc13783_thread_p; 162 unsigned int thread_id = mc13783_thread_id;
163 163
164 if (thread_id == 0) 164 if (thread_id == 0)
165 return; 165 return;
diff --git a/firmware/usb.c b/firmware/usb.c
index 2bff53e5d6..95c33ad8e9 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -539,7 +539,7 @@ void usb_start_monitoring(void)
539#ifdef USB_DRIVER_CLOSE 539#ifdef USB_DRIVER_CLOSE
540void usb_close(void) 540void usb_close(void)
541{ 541{
542 uintptr_t thread = usb_thread_entry; 542 unsigned int thread = usb_thread_entry;
543 usb_thread_entry = 0; 543 usb_thread_entry = 0;
544 544
545 if (thread == 0) 545 if (thread == 0)