len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 21:55:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Old patch from FS#7832: Sprinkle 'volatile' in the various inline assembler statements, needed for the driver to work when compiled with newer gcc, should make no functional difference with the currently used version

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21147 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2009-05-31 16:33:22 +00:00
parent 3651319d45
commit b2afc258dc
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
firmware/target/coldfire/pcf50606-coldfire.c
View file

@ -61,7 +61,7 @@
#define SCL_HI_IN and_l(~SCL_BIT, &SCL_GPIO_ENABLE); while(!SCL); #define SCL_HI_IN and_l(~SCL_BIT, &SCL_GPIO_ENABLE); while(!SCL);
#define DELAY \ #define DELAY \
asm ( \ asm volatile ( \
"move.l %[dly],%%d0 \n" \ "move.l %[dly],%%d0 \n" \
"1: \n" \ "1: \n" \
"subq.l #1,%%d0 \n" \ "subq.l #1,%%d0 \n" \
@ -89,7 +89,7 @@ void pcf50606_i2c_recalc_delay(int cpu_clock)
inline void pcf50606_i2c_start(void) inline void pcf50606_i2c_start(void)
{ {
#ifdef USE_ASM #ifdef USE_ASM
asm ( asm volatile (
"not.l %[sdab] \n" /* SDA_HI_IN */ "not.l %[sdab] \n" /* SDA_HI_IN */
"and.l %[sdab],(8,%[sdard]) \n" "and.l %[sdab],(8,%[sdard]) \n"
"not.l %[sdab] \n" "not.l %[sdab] \n"
@ -139,7 +139,7 @@ inline void pcf50606_i2c_start(void)
inline void pcf50606_i2c_stop(void) inline void pcf50606_i2c_stop(void)
{ {
#ifdef USE_ASM #ifdef USE_ASM
asm ( asm volatile (
"or.l %[sdab],(8,%[sdard]) \n" /* SDA_LO_OUT */ "or.l %[sdab],(8,%[sdard]) \n" /* SDA_LO_OUT */
"move.l %[dly],%%d0 \n" /* DELAY */ "move.l %[dly],%%d0 \n" /* DELAY */
@ -186,7 +186,7 @@ inline void pcf50606_i2c_stop(void)
inline void pcf50606_i2c_ack(bool ack) inline void pcf50606_i2c_ack(bool ack)
{ {
#ifdef USE_ASM #ifdef USE_ASM
asm ( asm volatile (
"tst.b %[ack] \n" /* if (!ack) */ "tst.b %[ack] \n" /* if (!ack) */
"bne.s 1f \n" "bne.s 1f \n"
@ -245,7 +245,7 @@ inline bool pcf50606_i2c_getack(void)
bool ret; bool ret;
#ifdef USE_ASM #ifdef USE_ASM
asm ( asm volatile (
"not.l %[sdab] \n" /* SDA_HI_IN */ "not.l %[sdab] \n" /* SDA_HI_IN */
"and.l %[sdab],(8,%[sdard]) \n" "and.l %[sdab],(8,%[sdard]) \n"
"not.l %[sdab] \n" "not.l %[sdab] \n"
@ -375,7 +375,7 @@ unsigned char pcf50606_i2c_inb(bool ack)
unsigned char byte = 0; unsigned char byte = 0;
#ifdef USE_ASM #ifdef USE_ASM
asm ( asm volatile (
"not.l %[sdab] \n" /* SDA_HI_IN */ "not.l %[sdab] \n" /* SDA_HI_IN */
"and.l %[sdab],(8,%[sdard]) \n" "and.l %[sdab],(8,%[sdard]) \n"
"not.l %[sdab] \n" "not.l %[sdab] \n"
@ -550,3 +550,4 @@ int pcf50606_write(int address, unsigned char val)
{ {
return pcf50606_write_multiple(address, &val, 1); return pcf50606_write_multiple(address, &val, 1);
} }