some comments and minor fixes

This commit is contained in:
giomba 2021-08-11 21:23:00 +02:00
parent 02a19ef783
commit 8fde6f1e74
4 changed files with 7 additions and 25 deletions

View File

@ -25,17 +25,8 @@ SRCS += main.c
# asm files # asm files
# S maiuscola! Invoca prima il compilatore gcc che interpreta macro e altro # S maiuscola! Invoca prima il compilatore gcc che interpreta macro e altro
# ASRC = main.S ASRC += main.S
ASRC += main.S frame.S ASRC += frame.S
#ASRC += video.S
#ASRC += sleep.S
# ASRC += variables.S
#ASRC += lines/line_white.S
#ASRC += lines/line_black.S
#ASRC += lines/line_mid.S
#ASRC += lines/line_syncs.S
#ASRC += lines/line_calc.S
# ASRC += lines/line_digits.S
# header files # header files
# Specify here libraries! Makefile will check existance before launching # Specify here libraries! Makefile will check existance before launching

View File

@ -1,3 +1,8 @@
/* frame.cpp
* Takes a black/white (1bpp) PNM ASCII-armored image as input,
* and produces the frame.S assembly code to draw it
* as an analog video signal for this project's kernel.
* */
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>

13
main.S
View File

@ -61,8 +61,6 @@ int_horizontal_sync: ; +3
cpi r31, 0 ; +21 cpi r31, 0 ; +21
breq enter ; +23 breq enter ; +23
jmp int_horizontal_sync_end jmp int_horizontal_sync_end
# cpi r30, VERTICAL_OFFSET ; +23
# brlo int_horizontal_sync_end ; +24
enter: enter:
; here, +23 or +24 cycles have passed since horizontal sync ; here, +23 or +24 cycles have passed since horizontal sync
@ -112,17 +110,6 @@ int_timer_0:
ijmp ijmp
# ; draw things
# ldi r30, lo8(line_buffer)
# ldi r31, hi8(line_buffer)
#.rept LINE_BUFFER_SIZE
# ld r29, z+
# out IO(PORTB), r29
# nop
#.endr
.global jump_table_return_address .global jump_table_return_address
jump_table_return_address: jump_table_return_address:
pop r29 pop r29

1
main.c
View File

@ -5,7 +5,6 @@
volatile uint16_t frame; volatile uint16_t frame;
volatile uint16_t line; volatile uint16_t line;
volatile char line_buffer[LINE_BUFFER_SIZE];
ISR(INT0_vect, ISR_NAKED) { ISR(INT0_vect, ISR_NAKED) {
asm("jmp int_vertical_sync"); asm("jmp int_vertical_sync");