From d1a218be717ed8840df234c4eabf2a5505df20ea Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Mon, 10 May 2021 17:03:01 +0200 Subject: Fix warnings --- src/bitmap.h | 2 +- src/common.h | 4 ++-- src/sequencer.c | 66 ++++++++++++++++++++++++++++----------------------------- src/text.h | 2 +- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/bitmap.h b/src/bitmap.h index c839900..135ab75 100644 --- a/src/bitmap.h +++ b/src/bitmap.h @@ -152,7 +152,7 @@ clear_screen_m4() { } } -static void +static inline void draw_fill_rect_m4(int x0, int y0, int x1, int y1, u8 col_index, vu16 *buffer) { int ix, iy; for(iy = y0; iy < y1; iy++) { diff --git a/src/common.h b/src/common.h index cf263db..aeea1a6 100644 --- a/src/common.h +++ b/src/common.h @@ -147,7 +147,7 @@ typedef Color Scanline[SCREEN_WIDTH]; #define PAL_BUFFER_SPRITES ((u16*)(MEM_PAL + 0x200)) #define PAL_BANK_BG ((Palette*) MEM_PAL) #define PAL_BANK_SPRITES ((Palette*)(MEM_PAL + 0x200)) -static u16 *backbuffer = ((vu16*)(MEM_VRAM + 0x0A000)); +static vu16 *backbuffer = ((vu16*)(MEM_VRAM + 0x0A000)); // // Sprites. @@ -655,7 +655,7 @@ typedef enum { NOTE_C_8 } Note; -static char * note_names[] = { +const char * note_names[] = { "C2", "C#2", "D2", "D#2", "E2", "F2", "F#2", "G2", "G#2", "A2", "A#2", "B2", "C3", "C#3", "D3", "D#3", "E3", "F3", "F#3", "G3", "G#3", "A3", "A#3", "B3", "C4", "C#4", "D4", "D#4", "E4", "F4", "F#4", "G4", "G#4", "A4", "A#4", "B4", diff --git a/src/sequencer.c b/src/sequencer.c index dfb2850..da2711e 100644 --- a/src/sequencer.c +++ b/src/sequencer.c @@ -302,41 +302,41 @@ typedef struct SeqTrigger { static SeqTrigger sequences[3][16] = { // Synth 1 { - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_C_4, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, }, // Synth 2 { - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, - {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, + {false, NOTE_G_5, 8, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0}, }, // Synth 3 { @@ -1324,7 +1324,7 @@ handle_sequencer_input(void) { u8 byte_number = param_selection_loc >> 1; u8 byte = sequences[2][trig_selection_loc].wave_a[byte_number]; if (odd) { - byte = (~0xF & byte) | (byte + increment) & 0xF; + byte = (~0xF & byte) | ((byte + increment) & 0xF); } else { byte = (0xF & byte) | (((byte >> 4) + increment) & 0xF) << 4; } diff --git a/src/text.h b/src/text.h index 9aa3fdd..3665760 100644 --- a/src/text.h +++ b/src/text.h @@ -84,7 +84,7 @@ txt_putc_m3(char c) { text_engine.cursor_x = 0; text_engine.cursor_y += text_engine.font.char_height; } else { - u8 idx = text_engine.font.char_map[c] * 2; + u8 idx = text_engine.font.char_map[(int)c] * 2; u32 *packed_char = text_engine.font.data; packed_char += idx; Tile tile = {0}; -- cgit v1.2.1