bslathi19/super6502
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix more bugs

Browse Source
This commit is contained in:
Byron Lathi
2023-12-01 00:56:16 -08:00
parent a169b30028
commit 32c82044a7
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sw/kernel/devices/serial.s
View File

@@ -85,7 +85,7 @@ L1: rts
ldy #$00 ; initialize y to 0 ldy #$00 ; initialize y to 0
L1: lda (ptr1),y ; load character from string L1: lda (ptr1),y ; load character from string
beq L2 ; Quit if NULL beq L2 ; Quit if NULL
jsr _uart_txb_block ; send character (does not change y or ptr1) jsr _serial_putc ; send character (does not change y or ptr1)
iny ; increment y iny ; increment y
bne L1 ; If Y == 0, increment high byte of pointer bne L1 ; If Y == 0, increment high byte of pointer
inc ptr1+1 inc ptr1+1

7
sw/kernel/devices/terminal.s
View File

@@ -23,7 +23,7 @@ terminal_buf: .res 128
.proc _terminal_read .proc _terminal_read
cmp #$00 ; Check that nbytes is > 0 and < 128 cmp #$00 ; Check that nbytes is > 0 and < 128
beq FAIL beq FAIL
cmp #$80 cmp #$81
bge FAIL bge FAIL
sta tmp1 ; Store nbytes in tmp1 sta tmp1 ; Store nbytes in tmp1
@@ -44,8 +44,9 @@ LOOP: cpy tmp1
jsr _serial_getc jsr _serial_getc
sta terminal_buf,y sta terminal_buf,y
cmp #$0a ; If newline, do something cmp #$0d ; If newline, do something
bne L2 bne L2
lda #$0a ; hacky serial, we want $0a, not $0d
jsr _serial_putc jsr _serial_putc
bra END bra END
@@ -61,7 +62,7 @@ L2: cmp #$08 ; Handle backspace
bra LOOP bra LOOP
L3: lda terminal_buf,y ; Normal character L3: lda terminal_buf,y ; Normal character
sta (tmp1),y sta (ptr1),y
jsr _serial_putc jsr _serial_putc
iny iny
bra LOOP bra LOOP

17
sw/kernel/kernel.c
View File

@@ -20,26 +20,25 @@ void handle_rtc_interrupt() {
char buf[128]; char buf[128];
int main() { int main() {
cputs("Kernel\n"); cputs("Kernel\n");
cputs("Init Mapper\n"); // cputs("Init Mapper\n");
init_mapper(); init_mapper();
cputs("Initialize Interrupts\n"); // cputs("Initialize Interrupts\n");
init_interrupts(); init_interrupts();
cputs("Initialize Interrupt Controller\n"); // cputs("Initialize Interrupt Controller\n");
init_interrupt_controller(); init_interrupt_controller();
cputs("Initialize RTC\n"); // cputs("Initialize RTC\n");
init_rtc(); init_rtc();
register_irq(&handle_rtc_interrupt, 0); register_irq(&handle_rtc_interrupt, 0);
asm volatile("cli"); asm volatile("cli");
cputs("Initialize Serial\n"); // cputs("Initialize Serial\n");
serial_init(); serial_init();
serial_puts("Hello from serial!\n"); serial_puts("Hello from serial!\n");
@@ -48,9 +47,13 @@ int main() {
terminal_write(0, "Terminal Write\n", 15); terminal_write(0, "Terminal Write\n", 15);
while(1) { while(1) {
terminal_read(0, buf, 128); if (terminal_read(0, buf, 128)) {
cprintf("Fail\n");
break;
}
terminal_write(0, "Got: ", 5); terminal_write(0, "Got: ", 5);
terminal_write(0, buf, strlen(buf)); terminal_write(0, buf, strlen(buf));
terminal_write(0, "\n", 1);
} }
return 0; return 0;