From f79100694d17bd370a72671c33d511a911a63e3e Mon Sep 17 00:00:00 2001 From: Matthew Laux Date: Wed, 3 Aug 2022 02:10:15 -0500 Subject: [PATCH] fix 8x16, inconsistent flags for lcd (1 << n) vs just n --- src/lcd.c | 6 +++--- src/lcd.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lcd.c b/src/lcd.c index 6021606..7c7d3eb 100644 --- a/src/lcd.c +++ b/src/lcd.c @@ -7,18 +7,18 @@ void lcd_set_bit(struct lcd *lcd, u16 addr, u8 bit) { - lcd_write(lcd, addr, lcd_read(lcd, addr) | (1 << bit)); + lcd_write(lcd, addr, lcd_read(lcd, addr) | bit); } void lcd_clear_bit(struct lcd *lcd, u16 addr, u8 bit) { - lcd_write(lcd, addr, lcd_read(lcd, addr) & ~(1 << bit)); + lcd_write(lcd, addr, lcd_read(lcd, addr) & ~bit); } int lcd_isset(struct lcd *lcd, u16 addr, u8 bit) { u8 val = lcd_read(lcd, addr); - return val & (1 << bit); + return val & bit; } void lcd_set_mode(struct lcd *lcd, int mode) diff --git a/src/lcd.h b/src/lcd.h index a3923bd..50cb854 100644 --- a/src/lcd.h +++ b/src/lcd.h @@ -23,11 +23,11 @@ #define REG_LCD_LAST REG_WX -#define STAT_FLAG_MATCH 2 -#define STAT_INTR_SOURCE_HBLANK 3 -#define STAT_INTR_SOURCE_VBLANK 4 -#define STAT_INTR_SOURCE_MODE2 5 -#define STAT_INTR_SOURCE_MATCH 6 +#define STAT_FLAG_MATCH (1 << 2) +#define STAT_INTR_SOURCE_HBLANK (1 << 3) +#define STAT_INTR_SOURCE_VBLANK (1 << 4) +#define STAT_INTR_SOURCE_MODE2 (1 << 5) +#define STAT_INTR_SOURCE_MATCH (1 << 6) #define LCDC_ENABLE_BG (1 << 0)