renamed makros M_IO_READ and M_IO_WRITE to inr and outr

This commit is contained in:
Martin Preuss
2025-05-28 00:49:07 +02:00
parent 042db13994
commit 961568f721
6 changed files with 77 additions and 50 deletions

View File

@@ -69,25 +69,25 @@ systemSleep:
; only modify SE, SM2, SM1 and SM0
cli
M_IO_READ r16, MCUCR
inr r16, MCUCR
cbr r16, (1<<SE) | (1<<SM2) | (1<<SM1)
M_IO_WRITE MCUCR, r16
outr MCUCR, r16
M_IO_READ r16, EMCUCR
inr r16, EMCUCR
cbr r16, (1<<SM0)
M_IO_WRITE EMCUCR, r16
outr EMCUCR, r16
sei ; make sure interrupts really are enabled
M_IO_READ r16, MCUCR ; enable sleep mode
inr r16, MCUCR ; enable sleep mode
sbr r16, (1<<SE)
M_IO_WRITE MCUCR, r16
outr MCUCR, r16
sleep ; sleep, wait for interrupt
M_IO_READ r16, MCUCR ; disable sleep mode
inr r16, MCUCR ; disable sleep mode
cbr r16, (1<<SE)
M_IO_WRITE MCUCR, r16
outr MCUCR, r16
ret
; @end
@@ -140,13 +140,13 @@ systemSetupTimer0: ; setup timer for IRQ every 100ms
.endif
.ifdef TIMSK0
M_IO_READ r16, TIMSK0
inr r16, TIMSK0
sbr r16, (1<<OCIE0) ; Timer/Counter0 Output Compare Match A Interrupt Enable
M_IO_WRITE TIMSK0, r16
outr TIMSK0, r16
.else
M_IO_READ r16, TIMSK
inr r16, TIMSK
sbr r16, (1<<OCIE0) ; Timer/Counter0 Output Compare Match A Interrupt Enable
M_IO_WRITE TIMSK, r16
outr TIMSK, r16
.endif
sec