github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-01-25 11:46:37 +00:00
Code Releases Activity

Fixed compiler identified bugs and warnings.

Browse Source
This commit is contained in:
Mark Pizzolato
2012-11-08 06:23:52 -08:00
parent df0fbcd047
commit 6cda56650d
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
display/display.c
View File

@@ -85,9 +85,9 @@
#define ELEMENTS(X) (sizeof(X)/sizeof(X[0]))
struct phosphor {
float red, green, blue;
float level; /* decay level (0.5 for half life) */
float t_level; /* seconds to decay to level */
double red, green, blue;
double level; /* decay level (0.5 for half life) */
double t_level; /* seconds to decay to level */
};
struct color {
@@ -545,7 +545,7 @@ display_delay(int t, int slowdown)
#endif /* DEBUG_DELAY defined */
}
}
else if (elapsed < MINELAPSED || slowdown && delay < MINDELAY) {
else if ((elapsed < MINELAPSED) || (slowdown && (delay < MINDELAY))) {
/* too little elapsed time passed, or delta very small */
int gain = delay_check>>GAINSHIFT;
if (gain == 0)
@@ -783,13 +783,13 @@ phosphor_init(struct phosphor *phosphors, int nphosphors, int color)
* for each of R G and B to be greater than 1.0
*/
r = rr * level_scale[ilevel] * 0xffff;
r = (int)(rr * level_scale[ilevel] * 0xffff);
if (r > 0xffff) r = 0xffff;
g = rg * level_scale[ilevel] * 0xffff;
g = (int)(rg * level_scale[ilevel] * 0xffff);
if (g > 0xffff) g = 0xffff;
b = rb * level_scale[ilevel] * 0xffff;
b = (int)(rb * level_scale[ilevel] * 0xffff);
if (b > 0xffff) b = 0xffff;
cp = ws_color_rgb(r, g, b);