diff options
author | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2024-10-13 11:27:06 +0300 |
---|---|---|
committer | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2024-10-13 11:27:06 +0300 |
commit | 1a81b5e4e3691eb725bb1ea6a0f7e93199e2737d (patch) | |
tree | 42cd500f6a19315c442ecd0baf855cc623103564 /src/gfx | |
parent | eb15e41211c4a10b14561ec069f75c90f03d7c91 (diff) |
Signed-off-by: Martin-Éric Racine <martin-eric.racine@iki.fi>
Diffstat (limited to 'src/gfx')
-rw-r--r-- | src/gfx/disp_gu1.c | 2 | ||||
-rw-r--r-- | src/gfx/disp_gu2.c | 7 | ||||
-rw-r--r-- | src/gfx/gfx_defs.h | 4 | ||||
-rw-r--r-- | src/gfx/gfx_msr.c | 6 | ||||
-rw-r--r-- | src/gfx/gfx_vid.c | 4 | ||||
-rw-r--r-- | src/gfx/msr_rdcl.c | 14 | ||||
-rw-r--r-- | src/gfx/tv_fs450.c | 227 | ||||
-rw-r--r-- | src/gfx/vga_gu1.c | 8 | ||||
-rw-r--r-- | src/gfx/vid_1200.c | 8 |
9 files changed, 139 insertions, 141 deletions
diff --git a/src/gfx/disp_gu1.c b/src/gfx/disp_gu1.c index fa081eb..b8e5938 100644 --- a/src/gfx/disp_gu1.c +++ b/src/gfx/disp_gu1.c @@ -257,7 +257,7 @@ gfx_set_display_bpp(unsigned short bpp) *---------------------------------------------------------------------------- */ int -gu1_set_specified_mode(DISPLAYMODE * pMode, int bpp) +gu1_set_specified_mode(DISPLAYMODE *pMode, int bpp) { unsigned long unlock, value; unsigned long gcfg, tcfg, ocfg; diff --git a/src/gfx/disp_gu2.c b/src/gfx/disp_gu2.c index 8bd89e9..43f5e1f 100644 --- a/src/gfx/disp_gu2.c +++ b/src/gfx/disp_gu2.c @@ -135,7 +135,7 @@ gfx_set_display_bpp(unsigned short bpp) *---------------------------------------------------------------------------- */ int -gu2_set_specified_mode(DISPLAYMODE * pMode, int bpp) +gu2_set_specified_mode(DISPLAYMODE *pMode, int bpp) { unsigned long unlock, value; unsigned long gcfg, dcfg; @@ -1753,7 +1753,6 @@ gfx_mode_frequency_supported(int xres, int yres, int bpp, unsigned long bpp_flag = 0; gfx_mode_bpp_conversion_def(bpp) - for (index = 0; index < NUM_RC_DISPLAY_MODES; index++) { if ((DisplayParams[index].hactive == (unsigned int) xres) && (DisplayParams[index].vactive == (unsigned int) yres) && @@ -1810,7 +1809,6 @@ gfx_get_refreshrate_from_frequency(int xres, int yres, int bpp, int *hz, *hz = 60; gfx_mode_bpp_conversion_def(bpp) - /* FIND THE REGISTER VALUES FOR THE DESIRED FREQUENCY */ /* Search the table for the closest frequency (16.16 format). */ min = 0x7fffffff; @@ -1877,7 +1875,6 @@ gfx_get_refreshrate_from_mode(int xres, int yres, int bpp, int *hz, *hz = 60; gfx_mode_bpp_conversion_def(bpp) - /* FIND THE REGISTER VALUES FOR THE DESIRED FREQUENCY */ /* Search the table for the closest frequency (16.16 format). */ min = 0x7fffffff; @@ -1942,7 +1939,6 @@ gfx_get_frequency_from_refreshrate(int xres, int yres, int bpp, int hz, *frequency = 0; gfx_mode_hz_conversion gfx_mode_bpp_conversion_def(bpp) - /* FIND THE REGISTER VALUES FOR THE DESIRED FREQUENCY */ /* Search the table for the closest frequency (16.16 format). */ for (index = 0; index < NUM_RC_DISPLAY_MODES; index++) { @@ -2002,7 +1998,6 @@ gfx_get_display_mode(int *xres, int *yres, int *bpp, int *hz) /* SET BPP FLAGS TO LIMIT MODE SELECTION */ gfx_mode_bpp_conversion_def(*bpp) - for (mode = 0; mode < NUM_RC_DISPLAY_MODES; mode++) { if ((DisplayParams[mode].hactive == (unsigned int) *xres) && (DisplayParams[mode].vactive == (unsigned int) *yres) && diff --git a/src/gfx/gfx_defs.h b/src/gfx/gfx_defs.h index 46815db..e7b952c 100644 --- a/src/gfx/gfx_defs.h +++ b/src/gfx/gfx_defs.h @@ -114,9 +114,9 @@ /* ACCESS TO MSRS */ void gfx_msr_asm_write(unsigned short msrReg, uint32_t msrAddr, - uint32_t *ptrHigh, uint32_t *ptrLow); + uint32_t * ptrHigh, uint32_t * ptrLow); void gfx_msr_asm_read(unsigned short msrReg, uint32_t msrAddr, - uint32_t *ptrHigh, uint32_t *ptrLow); + uint32_t * ptrHigh, uint32_t * ptrLow); #define MSR_READ( MBD_MSR_CAP, address, valueHigh_ptr, valueLow_ptr ) \ gfx_msr_asm_read( ((unsigned short)(MBD_MSR_CAP)), address, \ diff --git a/src/gfx/gfx_msr.c b/src/gfx/gfx_msr.c index a779971..b1a8a2f 100644 --- a/src/gfx/gfx_msr.c +++ b/src/gfx/gfx_msr.c @@ -72,7 +72,7 @@ gfx_msr_init() *---------------------------------------------------------------------------- */ DEV_STATUS -gfx_id_msr_device(MSR * pDev, unsigned long address) +gfx_id_msr_device(MSR *pDev, unsigned long address) { DEV_STATUS ret_value = NOT_KNOWN; @@ -123,7 +123,7 @@ gfx_get_glink_id_at_address(unsigned int *device, unsigned long address) *---------------------------------------------------------------------------- */ DEV_STATUS -gfx_msr_read(unsigned int device, unsigned int msrRegister, Q_WORD * msrValue) +gfx_msr_read(unsigned int device, unsigned int msrRegister, Q_WORD *msrValue) { DEV_STATUS ret_value = NOT_KNOWN; @@ -140,7 +140,7 @@ gfx_msr_read(unsigned int device, unsigned int msrRegister, Q_WORD * msrValue) *---------------------------------------------------------------------------- */ DEV_STATUS -gfx_msr_write(unsigned int device, unsigned int msrRegister, Q_WORD * msrValue) +gfx_msr_write(unsigned int device, unsigned int msrRegister, Q_WORD *msrValue) { DEV_STATUS ret_value = NOT_KNOWN; diff --git a/src/gfx/gfx_vid.c b/src/gfx/gfx_vid.c index c4215e8..a396538 100644 --- a/src/gfx/gfx_vid.c +++ b/src/gfx/gfx_vid.c @@ -1768,7 +1768,7 @@ gfx_get_video_request(short *x, short *y) *--------------------------------------------------------------------------- */ int -gfx_get_video_source(VideoSourceType * source) +gfx_get_video_source(VideoSourceType *source) { int status = GFX_STATUS_UNSUPPORTED; @@ -1784,7 +1784,7 @@ gfx_get_video_source(VideoSourceType * source) *--------------------------------------------------------------------------- */ int -gfx_get_vbi_source(VbiSourceType * source) +gfx_get_vbi_source(VbiSourceType *source) { int status = GFX_STATUS_UNSUPPORTED; diff --git a/src/gfx/msr_rdcl.c b/src/gfx/msr_rdcl.c index 1a01be7..a3637d5 100644 --- a/src/gfx/msr_rdcl.c +++ b/src/gfx/msr_rdcl.c @@ -381,7 +381,7 @@ redcloud_init_msr_devices(MSR aDev[], unsigned int array_size) *------------------------------------------------------------------ */ DEV_STATUS -redcloud_find_msr_device(MSR * pDev) +redcloud_find_msr_device(MSR *pDev) { unsigned int i; @@ -454,10 +454,10 @@ redcloud_find_msr_device(MSR * pDev) */ #if GFX_MSR_DYNAMIC DEV_STATUS -redcloud_id_msr_device(MSR * pDev, unsigned long address) +redcloud_id_msr_device(MSR *pDev, unsigned long address) #else DEV_STATUS -gfx_id_msr_device(MSR * pDev, unsigned long address) +gfx_id_msr_device(MSR *pDev, unsigned long address) #endif { Q_WORD msrValue; @@ -579,10 +579,10 @@ gfx_get_glink_id_at_address(unsigned int *device, unsigned long address) #if GFX_MSR_DYNAMIC DEV_STATUS redcloud_msr_read(unsigned int device, unsigned int msrRegister, - Q_WORD * msrValue) + Q_WORD *msrValue) #else DEV_STATUS -gfx_msr_read(unsigned int device, unsigned int msrRegister, Q_WORD * msrValue) +gfx_msr_read(unsigned int device, unsigned int msrRegister, Q_WORD *msrValue) #endif { if (device < NUM_DEVS) { @@ -616,10 +616,10 @@ gfx_msr_read(unsigned int device, unsigned int msrRegister, Q_WORD * msrValue) #if GFX_MSR_DYNAMIC DEV_STATUS redcloud_msr_write(unsigned int device, unsigned int msrRegister, - Q_WORD * msrValue) + Q_WORD *msrValue) #else DEV_STATUS -gfx_msr_write(unsigned int device, unsigned int msrRegister, Q_WORD * msrValue) +gfx_msr_write(unsigned int device, unsigned int msrRegister, Q_WORD *msrValue) #endif { if (device < NUM_DEVS) { diff --git a/src/gfx/tv_fs450.c b/src/gfx/tv_fs450.c index 99194b2..c2ac91d 100644 --- a/src/gfx/tv_fs450.c +++ b/src/gfx/tv_fs450.c @@ -404,91 +404,91 @@ static const struct { } tvsetup = { /* ntsc, pal, ntsc-eij, pal-m, pal-n */ { - 0x1f7cf021, 0xcb8a092a, 0x1f7cf021, 0xe3efe621, 0xcb8a092a}, - /* chroma_freq */ + 0x1f7cf021, 0xcb8a092a, 0x1f7cf021, 0xe3efe621, 0xcb8a092a}, + /* chroma_freq */ { - 0, 0, 0, 0, 0}, - /* chroma_phase */ + 0, 0, 0, 0, 0}, + /* chroma_phase */ { - 2, 0, 2, 0, 0}, - /* cphase_rst */ + 2, 0, 2, 0, 0}, + /* cphase_rst */ { - 54, 43, 54, 43, 43}, - /* color */ + 54, 43, 54, 43, 43}, + /* color */ { - 0, 31, 0, 29, 29}, - /* cr_burst_level */ + 0, 31, 0, 29, 29}, + /* cr_burst_level */ { - 59, 44, 59, 41, 41}, - /* cb_burst_level */ + 59, 44, 59, 41, 41}, + /* cb_burst_level */ { - 0, 1, 0, 0, 1}, - /* sys625_50 */ + 0, 1, 0, 0, 1}, + /* sys625_50 */ { - 0, 1, 0, 0, 0}, - /* vsync5 */ + 0, 1, 0, 0, 0}, + /* vsync5 */ { - 0, 1, 0, 1, 1}, - /* pal_mode */ + 0, 1, 0, 1, 1}, + /* pal_mode */ { - 0x7a, 0x7a, 0x7a, 0x7a, 0x7a}, - /* hsync_width */ + 0x7a, 0x7a, 0x7a, 0x7a, 0x7a}, + /* hsync_width */ { - 0x40, 0x3c, 0x40, 0x40, 0x3c}, - /* burst_width */ + 0x40, 0x3c, 0x40, 0x40, 0x3c}, + /* burst_width */ { - 0x80, 0x9a, 0x80, 0x80, 0x9a}, - /* back_porch */ + 0x80, 0x9a, 0x80, 0x80, 0x9a}, + /* back_porch */ { - 0x24, 0x1e, 0x24, 0x24, 0x1e}, - /* front_porch */ + 0x24, 0x1e, 0x24, 0x24, 0x1e}, + /* front_porch */ { - 0x19, 0x1a, 0x19, 0x12, 0x1a}, - /* breeze_way */ + 0x19, 0x1a, 0x19, 0x12, 0x1a}, + /* breeze_way */ { - 0xb4, 0xb4, 0xb4, 0xb4, 0xb4}, - /* active_line */ + 0xb4, 0xb4, 0xb4, 0xb4, 0xb4}, + /* active_line */ { - 240, 251, 240, 240, 240}, - /* blank_level */ + 240, 251, 240, 240, 240}, + /* blank_level */ { - 240, 251, 240, 240, 240}, - /* vbi_blank_level */ + 240, 251, 240, 240, 240}, + /* vbi_blank_level */ { - 284, 252, 240, 252, 252}, - /* black_level */ + 284, 252, 240, 252, 252}, + /* black_level */ { - 823, 821, 823, 821, 821}, - /* white_level */ + 823, 821, 823, 821, 821}, + /* white_level */ { - 60, 48, 60, 48, 48}, - /* hamp_offset */ + 60, 48, 60, 48, 48}, + /* hamp_offset */ { - 0x08, 0x08, 0x08, 0x08, 0x08}, - /* sync_level */ + 0x08, 0x08, 0x08, 0x08, 0x08}, + /* sync_level */ { - 525, 625, 525, 525, 625}, - /* tv_lines */ + 525, 625, 525, 525, 625}, + /* tv_lines */ { - 858, 864, 858, 858, 864}, - /* tv_width */ + 858, 864, 858, 858, 864}, + /* tv_width */ { - 487, 576, 487, 487, 576}, - /* tv_active_lines */ + 487, 576, 487, 487, 576}, + /* tv_active_lines */ { - 800, 800, 800, 800, 800}, - /* tv_active_width */ + 800, 800, 800, 800, 800}, + /* tv_active_width */ { - 0x1a, 0x1d, 0x1a, 0x1d, 0x1d}, - /* notch filter enabled */ + 0x1a, 0x1d, 0x1a, 0x1d, 0x1d}, + /* notch filter enabled */ { - 0x0000, 0x0100, 0x0000, 0x0000, 0x0100}, - /* houston cr pal */ + 0x0000, 0x0100, 0x0000, 0x0000, 0x0100}, + /* houston cr pal */ { - 0x7e48, 0xf580, 0x7e48, 0x7e48, 0xf580}, - /* houston ncodl */ + 0x7e48, 0xf580, 0x7e48, 0x7e48, 0xf580}, + /* houston ncodl */ { - 0x001b, 0x0020, 0x001b, 0x001b, 0x0020} + 0x001b, 0x0020, 0x001b, 0x001b, 0x0020} /* houston ncodh */ }; @@ -818,7 +818,6 @@ FS450_init(void) int err; TRACE(("FS450_Init()\n")) - err = houston_init(); if (err) return err; @@ -1650,7 +1649,7 @@ gfx_set_tv_cc_data(unsigned char data1, unsigned char data2) /*==========================================================================*/ int -FS450_ReadRegister(S_REG_INFO * p_reg) +FS450_ReadRegister(S_REG_INFO *p_reg) { unsigned long tmp; @@ -1682,7 +1681,7 @@ FS450_ReadRegister(S_REG_INFO * p_reg) } int -FS450_WriteRegister(S_REG_INFO * p_reg) +FS450_WriteRegister(S_REG_INFO *p_reg) { if (PLAL_WriteRegister(p_reg)) return 0; @@ -1709,7 +1708,6 @@ houston_init(void) unsigned long write, read; TRACE(("houston_init()\n")) - /*Before we begin, we must enable power to the TFT */ read = READ_VID32(CS5530_DISPLAY_CONFIG); read |= CS5530_DCFG_FP_PWR_EN | CS5530_DCFG_FP_DATA_EN; @@ -1762,7 +1760,6 @@ config_init(void) int err; TRACE(("config_init()\n")) - err = houston_init(); if (err) return err; @@ -1795,15 +1792,22 @@ static const struct { int tvsetup_index; } g_tv_standards[] = { { - GFX_TV_STANDARD_NTSC_M, 0}, { - GFX_TV_STANDARD_NTSC_M_J, 2}, { - GFX_TV_STANDARD_PAL_B, 1}, { - GFX_TV_STANDARD_PAL_D, 1}, { - GFX_TV_STANDARD_PAL_H, 1}, { - GFX_TV_STANDARD_PAL_I, 1}, { - GFX_TV_STANDARD_PAL_M, 3}, { - GFX_TV_STANDARD_PAL_N, 4}, { -GFX_TV_STANDARD_PAL_G, 1},}; + GFX_TV_STANDARD_NTSC_M, 0}, { + GFX_TV_STANDARD_NTSC_M_J, 2}, { + GFX_TV_STANDARD_PAL_B, + 1}, { + GFX_TV_STANDARD_PAL_D, + 1}, { + GFX_TV_STANDARD_PAL_H, + 1}, { + GFX_TV_STANDARD_PAL_I, + 1}, + { + GFX_TV_STANDARD_PAL_M, 3}, { + GFX_TV_STANDARD_PAL_N, 4}, { + GFX_TV_STANDARD_PAL_G, + 1}, +}; static int map_tvstd_to_index(unsigned long tv_std) @@ -1904,11 +1908,18 @@ config_vga_mode(unsigned long vga_mode) int h_total; } vgaparams[] = { { - GFX_VGA_MODE_640X480, 640, 480, 1056}, { - GFX_VGA_MODE_720X487, 720, 487, 1056}, { - GFX_VGA_MODE_720X576, 720, 576, 1056}, { - GFX_VGA_MODE_800X600, 800, 600, 1056}, { - GFX_VGA_MODE_1024X768, 1024, 768, 1344},}; + GFX_VGA_MODE_640X480, 640, 480, 1056}, { + GFX_VGA_MODE_720X487, 720, 487, + 1056}, { + GFX_VGA_MODE_720X576, + 720, 576, 1056}, { + GFX_VGA_MODE_800X600, + 800, + 600, + 1056}, + { + GFX_VGA_MODE_1024X768, 1024, 768, 1344}, + }; unsigned long cr, misc, byp; unsigned int i; @@ -2270,11 +2281,9 @@ config_overscan_xy(unsigned long tv_std, base_v_total = scantable[vga_index].v_total[k]; range = fsmax(base_v_total - v_total_min, v_total_max - base_v_total); TRACE(("v_total range = %d\n", range)) - /*map +/-1000 overscan y into +/-range. */ v_offset = (int) ((((float) overscan_y * range) / 1000.f) + .5f); TRACE(("v_offset = %d\n", v_offset)) - /*range limit v_total. */ g_specs.v_total = range_limit(base_v_total + v_offset, v_total_min, v_total_max); @@ -2283,7 +2292,6 @@ config_overscan_xy(unsigned long tv_std, v_offset = (g_specs.v_total - v_total_min + (v_step / 2)) / v_step; g_specs.v_total = v_total_min + v_offset * v_step; TRACE(("desired v_total=%d\n", g_specs.v_total)) - /*vertical positioning (vsync setup). */ get_ffolat_ivo(vga_mode, tv_std, v_offset, &ffolat, &ivo); houston_WriteReg(HOUSTON_IVO, ivo, 2); @@ -2314,7 +2322,6 @@ config_overscan_xy(unsigned long tv_std, g_specs.v_sync = g_specs.v_total - 10; } TRACE(("v_total=%d v_sync=%d\n", g_specs.v_total, g_specs.v_sync)) - /* FFOLAT. */ houston_WriteReg(HOUSTON_FFO_LAT, ffolat, 2); @@ -2344,14 +2351,12 @@ config_overscan_xy(unsigned long tv_std, (int) hscale_min, (int) ((hscale_min - (int) hscale_min) * 1000), (int) hscale_max, (int) ((hscale_max - (int) hscale_max) * 1000))) - /* map overscan_x into min to max. */ hscale = hscale_min + ((overscan_x + 1000.0f) / 2000.0f) * (hscale_max - hscale_min); TRACE(("hscale = %u.%u\n", (int) hscale, (int) ((hscale - (int) hscale) * 1000))) - /* determine hsc where hscale = (1 + hsc/128) */ if (hscale >= 1.0f) hsc = (int) (128.f * (hscale - 1.0f) + .5f); @@ -2368,7 +2373,6 @@ config_overscan_xy(unsigned long tv_std, hscale = 1.0f + (hsc / 128.0f); TRACE(("recalculated hscale = %u.%u\n", (int) hscale, (int) ((hscale - (int) hscale) * 1000))) - /* horizontal offset. */ /* place hsync 40 before halfway from vga_width to htotal */ /* but not less than vga_width + 10 */ @@ -2378,7 +2382,6 @@ config_overscan_xy(unsigned long tv_std, /* also, make it even */ g_specs.h_sync &= ~1; TRACE(("hsync = %u\n", g_specs.h_sync)) - /* iho range is 0 to iho_max. */ /* iho_max is 2 * iho_center. */ /* iho_center is pre_pixels - (tvwidth / hscale - vga pixels) / 2. */ @@ -2793,55 +2796,55 @@ config_macrovision(unsigned long tv_std, unsigned int trigger_bits) /* off. only 2-line 4-line off. on. */ /* CS. CS. */ { - 0x00, 0x36, 0x3e, 0x3e, 0x00, 0x3e}, /*n0 */ + 0x00, 0x36, 0x3e, 0x3e, 0x00, 0x3e}, /*n0 */ { - 0x1d, 0x1d, 0x1d, 0x17, 0x1a, 0x1a}, /*n1 */ + 0x1d, 0x1d, 0x1d, 0x17, 0x1a, 0x1a}, /*n1 */ { - 0x11, 0x11, 0x11, 0x15, 0x22, 0x22}, /*n2 */ + 0x11, 0x11, 0x11, 0x15, 0x22, 0x22}, /*n2 */ { - 0x25, 0x25, 0x25, 0x21, 0x2a, 0x2a}, /*n3 */ + 0x25, 0x25, 0x25, 0x21, 0x2a, 0x2a}, /*n3 */ { - 0x11, 0x11, 0x11, 0x15, 0x22, 0x22}, /*n4 */ + 0x11, 0x11, 0x11, 0x15, 0x22, 0x22}, /*n4 */ { - 0x01, 0x01, 0x01, 0x05, 0x05, 0x05}, /*n5 */ + 0x01, 0x01, 0x01, 0x05, 0x05, 0x05}, /*n5 */ { - 0x07, 0x07, 0x07, 0x05, 0x02, 0x02}, /*n6 */ + 0x07, 0x07, 0x07, 0x05, 0x02, 0x02}, /*n6 */ { - 0x00, 0x00, 0x00, 0x02, 0x00, 0x00}, /*n7 */ + 0x00, 0x00, 0x00, 0x02, 0x00, 0x00}, /*n7 */ { - 0x1b, 0x1b, 0x1b, 0x1b, 0x1c, 0x1c}, /*n8 */ + 0x1b, 0x1b, 0x1b, 0x1b, 0x1c, 0x1c}, /*n8 */ { - 0x1b, 0x1b, 0x1b, 0x1b, 0x3d, 0x3d}, /*n9 */ + 0x1b, 0x1b, 0x1b, 0x1b, 0x3d, 0x3d}, /*n9 */ { - 0x24, 0x24, 0x24, 0x24, 0x14, 0x14}, /*n10 */ + 0x24, 0x24, 0x24, 0x24, 0x14, 0x14}, /*n10 */ { - 0x780f, 0x780f, 0x780f, 0x780f, 0x7e07, 0x7e07}, /*n11 */ + 0x780f, 0x780f, 0x780f, 0x780f, 0x7e07, 0x7e07}, /*n11 */ { - 0x0000, 0x0000, 0x0000, 0x0000, 0x5402, 0x5402}, /*n12 */ + 0x0000, 0x0000, 0x0000, 0x0000, 0x5402, 0x5402}, /*n12 */ { - 0x0f, 0x0f, 0x0f, 0x0f, 0xfe, 0xfe}, /*n13 */ + 0x0f, 0x0f, 0x0f, 0x0f, 0xfe, 0xfe}, /*n13 */ { - 0x0f, 0x0f, 0x0f, 0x0f, 0x7e, 0x7e}, /*n14 */ + 0x0f, 0x0f, 0x0f, 0x0f, 0x7e, 0x7e}, /*n14 */ { - 0x60, 0x60, 0x60, 0x60, 0x60, 0x60}, /*n15 */ + 0x60, 0x60, 0x60, 0x60, 0x60, 0x60}, /*n15 */ { - 0x01, 0x01, 0x01, 0x01, 0x00, 0x00}, /*n16 */ + 0x01, 0x01, 0x01, 0x01, 0x00, 0x00}, /*n16 */ { - 0x0a, 0x0a, 0x0a, 0x0a, 0x08, 0x08}, /*n17 */ + 0x0a, 0x0a, 0x0a, 0x0a, 0x08, 0x08}, /*n17 */ { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /*n18 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /*n18 */ { - 0x05, 0x05, 0x05, 0x05, 0x04, 0x04}, /*n19 */ + 0x05, 0x05, 0x05, 0x05, 0x04, 0x04}, /*n19 */ { - 0x04, 0x04, 0x04, 0x04, 0x07, 0x07}, /*n20 */ + 0x04, 0x04, 0x04, 0x04, 0x07, 0x07}, /*n20 */ { - 0x03ff, 0x03ff, 0x03ff, 0x03ff, 0x0155, 0x0155}, /*n21 */ + 0x03ff, 0x03ff, 0x03ff, 0x03ff, 0x0155, 0x0155}, /*n21 */ { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /*n22 */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /*n22 */ { - 0xa3, 0xa3, 0xa3, 0xa3, 0xa3, 0xa3}, /*agc_pulse_level */ + 0xa3, 0xa3, 0xa3, 0xa3, 0xa3, 0xa3}, /*agc_pulse_level */ { - 0xc8, 0xc8, 0xc8, 0xc8, 0xc8, 0xc8}, /*bp_pulse_level */ + 0xc8, 0xc8, 0xc8, 0xc8, 0xc8, 0xc8}, /*bp_pulse_level */ }; int nMode; @@ -3098,7 +3101,7 @@ WriteGx(unsigned long inRegAddr, unsigned long inData) /*==========================================================================*/ static int -PLAL_ReadRegister(S_REG_INFO * p_reg) +PLAL_ReadRegister(S_REG_INFO *p_reg) { if (!p_reg) return 0; @@ -3113,7 +3116,7 @@ PLAL_ReadRegister(S_REG_INFO * p_reg) } static int -PLAL_WriteRegister(const S_REG_INFO * p_reg) +PLAL_WriteRegister(const S_REG_INFO *p_reg) { if (!p_reg) return 0; @@ -3199,7 +3202,7 @@ PLAL_PrepForTVout(void) } static int -PLAL_SetTVTimingRegisters(const S_TIMING_SPECS * p_specs) +PLAL_SetTVTimingRegisters(const S_TIMING_SPECS *p_specs) { unsigned long reg; diff --git a/src/gfx/vga_gu1.c b/src/gfx/vga_gu1.c index 8cbfe4f..5240096 100644 --- a/src/gfx/vga_gu1.c +++ b/src/gfx/vga_gu1.c @@ -394,7 +394,7 @@ gfx_vga_set_graphics_bits(void) *---------------------------------------------------------------------------- */ int -gfx_vga_mode(gfx_vga_struct * vga, int xres, int yres, int bpp, int hz) +gfx_vga_mode(gfx_vga_struct *vga, int xres, int yres, int bpp, int hz) { unsigned int i; unsigned short pitch; @@ -447,7 +447,7 @@ gfx_vga_mode(gfx_vga_struct * vga, int xres, int yres, int bpp, int hz) *---------------------------------------------------------------------------- */ int -gfx_vga_pitch(gfx_vga_struct * vga, unsigned short pitch) +gfx_vga_pitch(gfx_vga_struct *vga, unsigned short pitch) { pitch >>= 3; vga->stdCRTCregs[0x13] = (unsigned char) pitch; @@ -464,7 +464,7 @@ gfx_vga_pitch(gfx_vga_struct * vga, unsigned short pitch) *---------------------------------------------------------------------------- */ int -gfx_vga_save(gfx_vga_struct * vga, int flags) +gfx_vga_save(gfx_vga_struct *vga, int flags) { int i; unsigned short crtcindex, crtcdata; @@ -540,7 +540,7 @@ gfx_vga_clear_extended(void) *---------------------------------------------------------------------------- */ int -gfx_vga_restore(gfx_vga_struct * vga, int flags) +gfx_vga_restore(gfx_vga_struct *vga, int flags) { int i; unsigned short crtcindex, crtcdata; diff --git a/src/gfx/vid_1200.c b/src/gfx/vid_1200.c index 3e6c023..d5656c0 100644 --- a/src/gfx/vid_1200.c +++ b/src/gfx/vid_1200.c @@ -2417,10 +2417,10 @@ gfx_get_video_request(short *x, short *y) */ #if GFX_VIDEO_DYNAMIC int -sc1200_get_video_source(VideoSourceType * source) +sc1200_get_video_source(VideoSourceType *source) #else int -gfx_get_video_source(VideoSourceType * source) +gfx_get_video_source(VideoSourceType *source) #endif { switch (READ_VID32(SC1200_VIDEO_DISPLAY_MODE) & SC1200_VIDEO_SOURCE_MASK) { @@ -2444,10 +2444,10 @@ gfx_get_video_source(VideoSourceType * source) */ #if GFX_VIDEO_DYNAMIC int -sc1200_get_vbi_source(VbiSourceType * source) +sc1200_get_vbi_source(VbiSourceType *source) #else int -gfx_get_vbi_source(VbiSourceType * source) +gfx_get_vbi_source(VbiSourceType *source) #endif { switch (READ_VID32(SC1200_VIDEO_DISPLAY_MODE) & SC1200_VBI_SOURCE_MASK) { |