1
0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2024-06-13 09:29:35 +00:00

changed presets (HALT for wait_vsync)

This commit is contained in:
Steven Hugg 2018-11-28 18:49:34 -05:00
parent 6404bfb43c
commit b366ffb1d1
5 changed files with 9 additions and 11 deletions

View File

@ -6,6 +6,7 @@
#include "common.h" #include "common.h"
//#link "common.c" //#link "common.c"
//#link "fonts.s"
#define XOFS 12 // sprite horiz. offset #define XOFS 12 // sprite horiz. offset

View File

@ -6,12 +6,9 @@
#include "common.h" #include "common.h"
volatile bool vint;
volatile uint_fast8_t vint_counter; volatile uint_fast8_t vint_counter;
void vint_handler(void) void vint_handler(void) {
{
vint = true;
vint_counter++; vint_counter++;
} }
@ -50,11 +47,6 @@ void putstring(byte x, byte y, const char* string) {
} }
} }
void wait_vsync() {
vint = false;
while (!vint) ;
}
void delay(byte i) { void delay(byte i) {
while (i--) { while (i--) {
wait_vsync(); wait_vsync();

View File

@ -26,6 +26,9 @@ typedef unsigned short word;
#ifndef CV_SMS #ifndef CV_SMS
uintptr_t __at(0x6a) font_bitmap_a; uintptr_t __at(0x6a) font_bitmap_a;
uintptr_t __at(0x6c) font_bitmap_0; uintptr_t __at(0x6c) font_bitmap_0;
#else
extern char font_bitmap_a[];
extern char font_bitmap_0[];
#endif #endif
#define COLOR_FGBG(fg,bg) (((fg)<<4)|(bg)) #define COLOR_FGBG(fg,bg) (((fg)<<4)|(bg))
@ -36,6 +39,8 @@ uintptr_t __at(0x6c) font_bitmap_0;
#define CHAR(ch) (ch-LOCHAR) #define CHAR(ch) (ch-LOCHAR)
#define wait_vsync() __asm__("halt")
extern volatile bool vint; extern volatile bool vint;
extern volatile uint_fast8_t vint_counter; extern volatile uint_fast8_t vint_counter;
@ -51,7 +56,6 @@ extern void clrscr();
extern byte getchar(byte x, byte y); extern byte getchar(byte x, byte y);
extern void putchar(byte x, byte y, byte attr); extern void putchar(byte x, byte y, byte attr);
extern void putstring(byte x, byte y, const char* string); extern void putstring(byte x, byte y, const char* string);
extern void wait_vsync();
extern void delay(byte i); extern void delay(byte i);
extern byte rndint(byte a, byte b); extern byte rndint(byte a, byte b);

View File

@ -1,4 +1,4 @@

.area _CODE .area _CODE
.globl _font_bitmap_a .globl _font_bitmap_a
.globl _font_bitmap_0 .globl _font_bitmap_0

View File

@ -9,6 +9,7 @@ import { ColecoVision_PRESETS } from "./coleco";
// http://www.smspower.org/Development/Index // http://www.smspower.org/Development/Index
// http://www.smspower.org/uploads/Development/sg1000.txt // http://www.smspower.org/uploads/Development/sg1000.txt
// http://www.smspower.org/uploads/Development/richard.txt
// TODO: merge w/ coleco // TODO: merge w/ coleco
export var SG1000_PRESETS = [ export var SG1000_PRESETS = [