diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2010-06-30 02:02:46 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2010-06-30 02:02:46 +0000 |
commit | e286b0bbc04a34c181978efce19c6d0814e228c0 (patch) | |
tree | 841288761e20dc9a7a25e5ba83306adf52547d65 /firmware/target/arm/s3c2440/lcd-s3c2440.c | |
parent | f4a00174b50c209f2a23b7a73fe7cb544ef59d02 (diff) | |
download | rockbox-e286b0bbc04a34c181978efce19c6d0814e228c0.tar.gz rockbox-e286b0bbc04a34c181978efce19c6d0814e228c0.zip |
Remove atomic register bit manipulation functions from i.MX and s3c target code and introduce generic functions for ARM (bitmod32, bitset32, and bitclr32). Multiprocessor support is possible but just not implemented at the moment, only interrupt lockout.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27188 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/s3c2440/lcd-s3c2440.c')
-rw-r--r-- | firmware/target/arm/s3c2440/lcd-s3c2440.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/arm/s3c2440/lcd-s3c2440.c b/firmware/target/arm/s3c2440/lcd-s3c2440.c index b9f7d3ef3d..77be29f556 100644 --- a/firmware/target/arm/s3c2440/lcd-s3c2440.c +++ b/firmware/target/arm/s3c2440/lcd-s3c2440.c | |||
@@ -101,7 +101,7 @@ static void LCD_CTRL_clock(bool onoff) | |||
101 | GPDCON |= 0xAAA0AAA0; | 101 | GPDCON |= 0xAAA0AAA0; |
102 | GPDUP |= 0xFCFC; | 102 | GPDUP |= 0xFCFC; |
103 | 103 | ||
104 | s3c_regset32(&CLKCON, 0x20); /* enable LCD clock */ | 104 | bitset32(&CLKCON, 0x20); /* enable LCD clock */ |
105 | LCDCON1 |= LCD_ENVID; | 105 | LCDCON1 |= LCD_ENVID; |
106 | } | 106 | } |
107 | else | 107 | else |
@@ -113,7 +113,7 @@ static void LCD_CTRL_clock(bool onoff) | |||
113 | GPDUP &= ~0xFCFC; | 113 | GPDUP &= ~0xFCFC; |
114 | 114 | ||
115 | LCDCON1 &= ~LCD_ENVID; /* Must disable first or bus may freeze */ | 115 | LCDCON1 &= ~LCD_ENVID; /* Must disable first or bus may freeze */ |
116 | s3c_regclr32(&CLKCON, 0x20); /* disable LCD clock */ | 116 | bitclr32(&CLKCON, 0x20); /* disable LCD clock */ |
117 | } | 117 | } |
118 | } | 118 | } |
119 | 119 | ||
@@ -165,7 +165,7 @@ static void LCD_SPI_SS(bool select) | |||
165 | 165 | ||
166 | static void LCD_SPI_start(void) | 166 | static void LCD_SPI_start(void) |
167 | { | 167 | { |
168 | s3c_regset32(&CLKCON, 0x40000); /* enable SPI clock */ | 168 | bitset32(&CLKCON, 0x40000); /* enable SPI clock */ |
169 | LCD_SPI_SS(false); | 169 | LCD_SPI_SS(false); |
170 | SPCON0=0x3E; | 170 | SPCON0=0x3E; |
171 | SPPRE0=24; | 171 | SPPRE0=24; |
@@ -179,7 +179,7 @@ static void LCD_SPI_stop(void) | |||
179 | LCD_SPI_SS(false); | 179 | LCD_SPI_SS(false); |
180 | 180 | ||
181 | SPCON0 &= ~0x10; | 181 | SPCON0 &= ~0x10; |
182 | s3c_regclr32(&CLKCON, 0x40000); /* disable SPI clock */ | 182 | bitclr32(&CLKCON, 0x40000); /* disable SPI clock */ |
183 | } | 183 | } |
184 | 184 | ||
185 | static void LCD_SPI_init(void) | 185 | static void LCD_SPI_init(void) |
@@ -253,7 +253,7 @@ void lcd_init_device(void) | |||
253 | GPBUP |= 0x181; | 253 | GPBUP |= 0x181; |
254 | #endif | 254 | #endif |
255 | 255 | ||
256 | s3c_regset32(&CLKCON, 0x20); /* enable LCD clock */ | 256 | bitset32(&CLKCON, 0x20); /* enable LCD clock */ |
257 | 257 | ||
258 | LCD_CTRL_setup(); | 258 | LCD_CTRL_setup(); |
259 | #ifdef GIGABEAT_F | 259 | #ifdef GIGABEAT_F |