i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot: Fix some always false conditions

Browse Source
This commit is contained in:
Lioncash
2014-09-26 20:56:04 +02:00
committed by François Revol
parent 907046dc4d
commit a4a9dade68
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/atari_m68k/console.cpp
+1 -1
View File
@@ -283,7 +283,7 @@ translate_color(int32 color)
15, 4, 2, 6, 1, 5, 3, 7, 15, 4, 2, 6, 1, 5, 3, 7,
8, 12, 10, 14, 9, 13, 11, 0 }; 8, 12, 10, 14, 9, 13, 11, 0 };
if (color < 0 && color >= 16) if (color < 0 || color >= 16)
return 0; return 0;
return cmap[color]; return cmap[color];
//return color; //return color;
src/system/boot/platform/atari_m68k/cpu.cpp
+3 -3
View File
@@ -71,11 +71,11 @@ check_cpu_features()
fpu = 68060; fpu = 68060;
else if (fpu_type & 0x8) else if (fpu_type & 0x8)
fpu = 68040; fpu = 68040;
else if (fpu_type & 0x6 == 0x6) else if ((fpu_type & 0x6) == 0x6)
fpu = 68882; fpu = 68882;
else if (fpu_type & 0x6 == 0x4) else if ((fpu_type & 0x6) == 0x4)
fpu = 68881; fpu = 68881;
else if (fpu_type & 0x6 == 0x2) else if ((fpu_type & 0x6) == 0x2)
fpu = 68881; // not certain fpu = 68881; // not certain
else if (fpu_type & 0x4) { else if (fpu_type & 0x4) {
panic("bad fpu"); panic("bad fpu");
src/system/boot/platform/cfe/console.cpp
+2 -2
View File
@@ -77,9 +77,9 @@ VTConsole::SetColor(int32 foreground, int32 background)
8, 12, 10, 14, 9, 13, 11, 0 }; 8, 12, 10, 14, 9, 13, 11, 0 };
char buff[] = "\033b \033c "; char buff[] = "\033b \033c ";
if (foreground < 0 && foreground >= 16) if (foreground < 0 || foreground >= 16)
return; return;
if (background < 0 && background >= 16) if (background < 0 || background >= 16)
return; return;
buff[2] += cmap[foreground]; buff[2] += cmap[foreground];