From c4077c4f2406fa7cbaf2ca88a72995ccbcb2ac70 Mon Sep 17 00:00:00 2001 From: ekeeke Date: Sat, 20 May 2023 19:44:57 +0200 Subject: [PATCH] [Core/Misc] Fixed -Wmaybe-uninitialized warnings with GCC compiler --- core/input_hw/xe_1ap.c | 8 ++++---- core/vdp_render.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/core/input_hw/xe_1ap.c b/core/input_hw/xe_1ap.c index 7cfb4f7..8a8cc62 100644 --- a/core/input_hw/xe_1ap.c +++ b/core/input_hw/xe_1ap.c @@ -2,7 +2,7 @@ * Genesis Plus * XE-1AP analog controller support * - * Copyright (C) 2011-2022 Eke-Eke (Genesis Plus GX) + * Copyright (C) 2011-2023 Eke-Eke (Genesis Plus GX) * * Redistribution and use of this code or any derivative works are permitted * provided that the following conditions are met: @@ -96,12 +96,12 @@ INLINE unsigned char xe_1ap_read(int index) case 9: /* CH3 low (Throttle vertical or horizontal direction) */ data = input.analog[port+1][0] & 0x0F; break; - case 10: /* N/A */ - data = 0x0F; - break; case 11: /* A B A' B' buttons status (active low) */ data = (~input.pad[port] >> 6) & 0x0F; break; + default: /* N/A */ + data = 0x0F; + break; } /* TL indicates current data cycle (0=1st cycle, 1=2nd cycle, etc) */ diff --git a/core/vdp_render.c b/core/vdp_render.c index 7aee11e..cc913f0 100644 --- a/core/vdp_render.c +++ b/core/vdp_render.c @@ -1852,10 +1852,13 @@ void render_bg_m5_vs(int line) /* Enhanced function that allows each cell to be vscrolled individually, instead of being limited to 2-cell */ void render_bg_m5_vs_enhanced(int line) { - int column, v_offset; + int column; uint32 atex, atbuf, *src, *dst; uint32 v_line, next_v_line, *nt; + /* Vertical scroll offset */ + int v_offset = 0; + /* Common data */ uint32 xscroll = *(uint32 *)&vram[hscb + ((line & hscroll_mask) << 2)]; uint32 yscroll = 0; @@ -2833,11 +2836,14 @@ void render_bg_m5_vs(int line) void render_bg_m5_vs_enhanced(int line) { - int column, start, end, v_offset; + int column, start, end; uint32 atex, atbuf, *src, *dst; uint32 shift, index, v_line, next_v_line, *nt; uint8 *lb; + /* Vertical scroll offset */ + int v_offset = 0; + /* Scroll Planes common data */ uint32 xscroll = *(uint32 *)&vram[hscb + ((line & hscroll_mask) << 2)]; uint32 yscroll = 0;