Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid compiler warning due to bogus comparison

Browse Source
This commit is contained in:
Markus Fröschle
2013-01-21 11:06:35 +00:00
parent 47e4651e0e
commit d76aae85ee
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BaS_gcc/.project
View File

@@ -7,7 +7,6 @@
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name> <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments> <arguments>
<dictionary> <dictionary>
<key>?name?</key> <key>?name?</key>

7
BaS_gcc/sources/sysinit.c
View File

@@ -45,7 +45,7 @@ extern volatile long _VRAM; /* start address of video ram from linker script */
* wait for the specified number of us on slice timer 0. Replaces the original routines that had * wait for the specified number of us on slice timer 0. Replaces the original routines that had
* the number of useconds to wait for hardcoded in their name. * the number of useconds to wait for hardcoded in their name.
*/ */
inline void wait(uint32_t us) inline __attribute__((always_inline)) void wait(uint32_t us)
{ {
uint32_t target = MCF_SLT_SCNT(0) - (us * 132); uint32_t target = MCF_SLT_SCNT(0) - (us * 132);
@@ -56,7 +56,7 @@ inline void wait(uint32_t us)
* the same as above, with a checker function which gets called while * the same as above, with a checker function which gets called while
* busy waiting and allows for an early return if it returns true * busy waiting and allows for an early return if it returns true
*/ */
inline bool waitfor(uint32_t us, int (*condition)(void)) inline __attribute__((always_inline)) bool waitfor(uint32_t us, int (*condition)(void))
{ {
uint32_t target = MCF_SLT_SCNT(0) - (us * 132); uint32_t target = MCF_SLT_SCNT(0) - (us * 132);
@@ -730,7 +730,8 @@ void init_ac97(void) {
vc = MCF_PSC2_PSCTB_AC97; vc = MCF_PSC2_PSCTB_AC97;
/* FIXME: that looks more than suspicious (Fredi?) */ /* FIXME: that looks more than suspicious (Fredi?) */
if ((va & 0xE0000fff) == 0xE0000800 & vb == 0x02000000 & vc == 0x00000000) { /* fixed with parentheses to avoid compiler warnings, but this looks still more than wrong to me */
if (((va & 0xE0000fff) == 0xE0000800) & (vb == 0x02000000) & (vc == 0x00000000)) {
goto livo; goto livo;
} }
} }