diff options
Diffstat (limited to 'sys/dev/fb/vga.c')
| -rw-r--r-- | sys/dev/fb/vga.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c index 78abb18..365fca4 100644 --- a/sys/dev/fb/vga.c +++ b/sys/dev/fb/vga.c @@ -602,7 +602,7 @@ map_mode_num(int mode) }; int i; - for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) { + for (i = 0; i < nitems(mode_map); ++i) { if (mode_map[i].from == mode) return mode_map[i].to; } @@ -655,7 +655,7 @@ map_gen_mode_num(int type, int color, int mode) } } - for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) { + for (i = 0; i < nitems(mode_map); ++i) { if (mode_map[i].from == mode) return ((color) ? mode_map[i].to_color : mode_map[i].to_mono); } @@ -702,7 +702,7 @@ map_bios_mode_num(int type, int color, int bios_mode) switch (type) { case KD_VGA: - if (bios_mode < sizeof(vga_modes)/sizeof(vga_modes[0])) + if (bios_mode < nitems(vga_modes)) return vga_modes[bios_mode]; else if (color) return M_VGA_C80x25; @@ -711,7 +711,7 @@ map_bios_mode_num(int type, int color, int bios_mode) break; case KD_EGA: - if (bios_mode < sizeof(ega_modes)/sizeof(ega_modes[0])) + if (bios_mode < nitems(ega_modes)) return ega_modes[bios_mode]; else if (color) return M_ENH_C80x25; @@ -720,7 +720,7 @@ map_bios_mode_num(int type, int color, int bios_mode) break; case KD_CGA: - if (bios_mode < sizeof(cga_modes)/sizeof(cga_modes[0])) + if (bios_mode < nitems(cga_modes)) return cga_modes[bios_mode]; else return M_C80x25; @@ -772,7 +772,7 @@ fill_adapter_param(int code, video_adapter_t *adp) { DCC_EGAMONO, DCC_CGA80 }, }; - if ((code < 0) || (code >= sizeof(dcc)/sizeof(dcc[0]))) { + if ((code < 0) || (code >= nitems(dcc))) { adp[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO]; adp[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80]; } else { @@ -918,7 +918,7 @@ comp_adpregs(u_char *buf1, u_char *buf2) if ((buf1 == NULL) || (buf2 == NULL)) return COMP_DIFFERENT; - for (i = 0; i < sizeof(params)/sizeof(params[0]); ++i) { + for (i = 0; i < nitems(params); ++i) { if (params[i].mask == 0) /* don't care */ continue; if ((buf1[i] & params[i].mask) != (buf2[i] & params[i].mask)) |
