Changeset cb32b0b in avrstuff

Timestamp:

Nov 14, 2010, 12:06:33 PM (13 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

86824a6

Parents:

8f4b118

Message:

• Code qui compile
• Corrections sur le CI.

git-svn-id: ​svn://pulkomandy.tk/avrstuff@33 c6672c3c-f6b6-47f9-9001-1fd6b12fecbe

Location:

CPC stuff/cpc_serial_2313

Files:

• code/main.asm (modified) (6 diffs)
• cpcser-cache.lib (added)
• cpcser.brd (added)
• cpcser.cmp (added)
• cpcser.net (added)
• cpcser.pro (added)
• cpcser.sch (added)

CPC stuff/cpc_serial_2313/code/main.asm

@@ -2 +2 @@
 ; Copyright 2010, Adrien Destugues <pulkomandy@pulkomandy.ath.cx>
 ; Distributed under the terms of the MIT Licence
-.INCLUDE "2313def.inc"
 
 ; Firmware for µSerial expansion board
 
-.EQU ALL_OUT = 255
-.EQU ALL_IN = 0
-
-.EQU DATADIR = DDRB
-.EQU DATAOUT = PORTB
-.EQU DATAIN = PINB
-
-.EQU CTRLIN = PIND
-.EQU CTRLOUT = PORTD
-.EQU CTRLDIR = DDRD
-
-.EQU A0 = PIND5
-.EQU _READ = PIND3
-.EQU _WRITE = PIND2
-.EQU DEL = PIND6
-.EQU INT = PIND4
-
-.EQU curregbak = SRAM_START
-
-; REGISTERS ALLOCATION
-; R0 = 255 used in interrupt handler for fast switching of DATADIR
-; X (R27 & R26) used in interrupt for fast addressing of regs
-
-.CSEG
 ; Vectors
 ; reset
-        RJMP init
 ; int0
         RJMP cpc_write
@@ -50 +24 @@
 
 ; --- READ INTERRUPT ---
-cpc_read:
+cpc_read
 ; That means we only have 5 cycles left to output the value on the BUS!
 ; We have no time to do anything, so we assume that X is already pointing at
@@ -64 +38 @@
 ; We assume X (R26:R27) points to the current reg
 ; So we can load it and react fast enough to the interrupt
-        OUT DATADIR,R16         ; 1
-        LD R27,X                        ; 2 cycles ; peut être économisé si un reg. contient
+        LDI R0,ALL_OUT ; 1 ; peut être économisé si on sacrifie un reg
+        OUT DATADIR,R0 ; 1
+        LD R27,(X)                      ; 2 cycles ; peut être économisé si un reg. contient
                                                                         ; déjà la valeur à envoyer
                                                                         ; (mais qui l'update ?)
-        OUT DATAOUT, R27        ; 1 cycle
+        OUT DATA, R27           ; 1 cycle
 
 ; Here data is sent, the CPC read operation is handled.
@@ -78 +53 @@
 
 ; Restore R27
-        LDS R27,curregbak
+        LD R27,curregbak
+        LD R27,(X)
 
 ; release the bus
-        SER R16
-        OUT DATADIR, R16
-        CLR R16
+        LDI R0,ALL_IN
+        OUT DATADIR, R0
 
 ; Restore R27 to selected reg. (we erased it to do the OUT)
         RETI
 
-
 ; --- WRITE INTERRUPT ---
-cpc_write:
+cpc_write
 ; The timing is a bit less constraining here.
-        PUSH R0                                         ; 2 cycles
-        IN R0,DATAIN                            ; 1
+        PUSH R0
+        IN R0,DATA
 ; we also need to know A0 state...
-        SBIS CTRLIN,A0                          ; 1
+        SBIS CTRL,A0
                 ; This was actually a reg select operation!
                 ; Jump to the proper code
@@ -105 +79 @@
         RJMP intEnd
 
-regSel:
-        STS curregbak,R0
+regSel
+        LD R27,curregbak
+        ST (X),R0
         MOV R27,R0
 
-intEnd:
         POP R0
         RETI
@@ -118 +92 @@
 ; At a bare minimum :
 ; * Set up the INT0 and INT1 so the CPC can do the rest of the setup itself
-init:
-        CLI
-        ; setup ctrl port : RW and A0 as inputs, INT and DEL as output
-        LDI R16,0x28
-        OUT CTRLDIR,R16
-
-        ; setup dataport as input
-        CLR R0
-        OUT DATADIR,R0
-
-        ; led on (will be turned off by software at init)
-        SBI CTRLOUT,DEL
-
-        ; init serial port speed and io
-        LDI R16,10
-        OUT UBRR,R16
-
-        ; check for bootloader jumper and jump to bootload code if needed
-        ; TODO
-
-        ; setup interrupts (enable INT0 and INT1 on falling edge)
-        LDI R16,0x0A
-        OUT MCUCR,R16
-
-        LDI R16,0xC0
-        OUT GIMSK,R16
-
-        ; we can now enable interrupts
-        SEI
-
-mainloop:
-        ; maybe we will have to handle a buffer for the serial port
-        ; and 'fake' registers in SRAM
-
-        SLEEP
-        RJMP mainloop