diff --git a/menu.h b/menu.h index 2789869..1b24c65 100644 --- a/menu.h +++ b/menu.h @@ -27,7 +27,6 @@ void EjectAllFloppies(); unsigned long getStatus(char *opt, unsigned long status); void menu_key_set(uint32_t c); -void menu_mod_set(uint32_t m); void substrcpy(char *d, char *s, char idx); extern char joy_bnames[12][32]; diff --git a/osd.c b/osd.c index 79419e7..0299f32 100644 --- a/osd.c +++ b/osd.c @@ -495,10 +495,6 @@ void OsdDisable(void) } -void MM1_ConfigFilter(unsigned char lores, unsigned char hires) { - spi_osd_cmd(MM1_OSDCMDCFGFLT | ((hires & 0x03) << 2) | (lores & 0x03)); -} - void ConfigVideo(unsigned char hires, unsigned char lores, unsigned char scanlines) { spi_osd_cmd16(OSD_CMD_VID, (((scanlines >> 6) & 0x03) << 10) | (((scanlines >> 4) & 0x03) << 8) | (((scanlines >> 2) & 0x03) << 6) | ((hires & 0x03) << 4) | ((lores & 0x03) << 2) | (scanlines & 0x03)); @@ -529,11 +525,6 @@ void ConfigFloppy(unsigned char drives, unsigned char speed) spi_osd_cmd8(OSD_CMD_FLP, ((drives & 0x03) << 2) | (speed & 0x03)); } -void MM1_ConfigScanlines(unsigned char scanlines) -{ - spi_osd_cmd(MM1_OSDCMDCFGSCL | (scanlines & 0x0F)); -} - void ConfigAutofire(unsigned char autofire, unsigned char mask) { uint16_t param = mask; diff --git a/osd.h b/osd.h index abdb93d..01e2652 100644 --- a/osd.h +++ b/osd.h @@ -71,12 +71,7 @@ void OsdWriteOffset(unsigned char n, char *s, unsigned char inver, unsigned char void OsdClear(void); void OsdEnable(unsigned char mode); void OsdDisable(void); -void OsdWaitVBL(void); void ConfigFilter(unsigned char lores, unsigned char hires); -void OsdReconfig(); // Reset to Chameleon core. - // deprecated functions from Minimig 1 -void MM1_ConfigFilter(unsigned char lores, unsigned char hires); -void MM1_ConfigScanlines(unsigned char scanlines); void ConfigVideo(unsigned char hires, unsigned char lores, unsigned char scanlines); void ConfigAudio(unsigned char audio); void ConfigMemory(unsigned char memory); @@ -85,8 +80,6 @@ void ConfigChipset(unsigned char chipset); void ConfigFloppy(unsigned char drives, unsigned char speed); void ConfigAutofire(unsigned char autofire, unsigned char mask); void OSD_PrintText(unsigned char line, char *text, unsigned long start, unsigned long width, unsigned long offset, unsigned char invert); -void OsdWriteDoubleSize(unsigned char n, char *s, unsigned char pass); -//void OsdDrawLogo(unsigned char n, char row); void OsdDrawLogo(unsigned char n, char row, char superimpose); void ScrollText(char n, const char *str, int off, int len, int max_len, unsigned char invert); void ScrollReset();