much debugging; reading now seems to work!

diff --git a/detpic/i2clib.asm b/detpic/i2clib.asm
index 0c3e80ff85e9222a8c52b33d7ca8d7d424cec405..f2af7852cc27d768177bcfde0cd30c3ecb908eb6 100644 (file)
--- a/detpic/i2clib.asm
+++ b/detpic/i2clib.asm
@@ -60,6 +60,7 @@ sspcon2               res     1       ; master only
 slave          res     1       ; master only
 
 st             res     1
+st_orig                res     1
 
 ; st is a bitmask, bit set in visible states:
                  ;    master                          slave
@@ -96,6 +97,7 @@ i2cm_init
                mov_wf  SSPCON1
                clr_f   SSPCON2 ; nothing going
                mov_lw  0x80    ; SMP(noslew), !CKE(!smbus)
+               mov_wf  SSPSTAT
                bra     init_enable
 
 ;----------
@@ -108,14 +110,15 @@ i2cm_interrupt
                mov_ff  SSPCON1, sspcon1
                mov_ff  SSPCON2, sspcon2
 
-               bt_f_if1 sspcon1, WCOL
-               bra_z   m_event_bad
-               bt_f_if1 sspcon1, SSPOV
-               bra_z   m_event_bad
+               bc_f    PIR1, SSPIF
+
+               mov_lw  (1<<WCOL) | (1<<SSPOV)
+               and_wfw sspcon1
+               bra_nz  m_event_bad
 
                ; No ?  Well, then the I2C should be idle now:
                mov_fw  sspcon2
-               and_lw  ~0x60 ; ACKSTAT,ACKDT
+               and_lw  ~((1<<ACKSTAT) | (1<<ACKDT)) ; those two are ok if set
                bra_nz  m_event_bad
                ; OK...
 
@@ -306,6 +309,8 @@ m_read_ack
                bc_f    st, st_awaiting
                bs_f    st, st_acking
                bc_f    SSPCON2, ACKDT ; ACKDT=0 means to acknowledge
+               bt_f_if0 st, st_reading
+               bs_f    SSPCON2, ACKDT ; don't ack last byte
                bs_f    SSPCON2, ACKEN
                return
 
@@ -354,7 +359,7 @@ i2cs_init
                mov_wf  SSPCON1
                mov_lw  0x01 ; !GCEN, SEN
                mov_wf  SSPCON2
-               mov_lw  0x8 ; SMP(noslew), !CKE(!smbus)
+               mov_lw  0x80 ; SMP(noslew), !CKE(!smbus)
                mov_wf  SSPSTAT
 init_enable
 ; Actually engages the I2C controller, which must already have
@@ -370,6 +375,7 @@ init_enable
                set_f   sspstat
                set_f   sspcon1
                set_f   sspcon2
+               set_f   st_orig
                bs_f    TRISB, 0
                bs_f    TRISB, 1
                bc_f    IPR1, SSPIP
@@ -410,22 +416,22 @@ i2cs_interrupt
                return
                ; We have an interrupt:
 
-               bt_f_if1 sspcon1, WCOL
-               bra_z   s_event_bad
-               bt_f_if1 sspcon1, SSPOV
-               bra_z   s_event_bad
-
 ; Firstly, clear the interrupt flag so that if something else happens
 ; while we faff, the interrupt will be regenerated:
                bc_f    PIR1, SSPIF
 
                mov_ff  SSPSTAT, sspstat
                mov_ff  SSPCON1, sspcon1
+               mov_ff  st, st_orig
 
-               bt_f_if0 st, st_reading
+               mov_lw  (1<<WCOL) | (1<<SSPOV)
+               and_wfw sspcon1
+               bra_nz  s_event_bad
+
+               bt_f_if1 st, st_reading
                bra     s_event_reading
 
-               bt_f_if0 st, st_writing
+               bt_f_if1 st, st_writing
                bra     s_event_writing
 
 s_event_idle
@@ -448,6 +454,11 @@ s_event_reading
                chkvals_start_sspstat
                chkval  0, 0xac, s_event_reading_datasent ; D,!P, S,R,!BF
 
+; mov_fw st
+; bra_z nopanic
+; panic morse_Z
+;nopanic
+
                ; Whatever is happening, we're done reading now !
                clr_f   st
                call    i2csu_read_done

diff --git a/detpic/morse.messages b/detpic/morse.messages
index 54847f6bb80121d46701ad831b58ed764fbd3f5d..a785f2070320cea85f58de14b49fe1698a562063 100644 (file)
--- a/detpic/morse.messages
+++ b/detpic/morse.messages
@@ -30,11 +30,12 @@ TI4                         ; for iwj
 TI5                            ; for iwj
 X      test-sofar:ch           ; bad character received from host
 
-Z      ::nonexistent_variable  ; test message
+ZM     i2clib:st,:sspstat,:sspcon1,:sspcon2 ; for testing
+ZS     i2clib:st,:sspstat,:sspcon1,:st_orig ; for testing
 
 # Messages for i2clib, S*
 SM     i2clib:st,:sspstat,:sspcon1,:sspcon2 ; m.,i., ctrlr bad state
-SS     i2clib:st,:sspstat,:sspcon1     ; slave, intr, controller bad state
+SS     i2clib:st,:sspstat,:sspcon1,:st_orig ; s.,i., controller bad state
 SK     i2clib:slave                    ; m. couldn't address slave (no ack)
 SN     i2clib:slave                    ; improper slave number
 SW     i2clib:st                       ; improper i2cm_write_start