From bdc7f4a89cd3c394238e62006f8de5ed533ac4cd Mon Sep 17 00:00:00 2001 From: ian Date: Thu, 22 Dec 2005 23:44:06 +0000 Subject: [PATCH] mascan compilation wip --- detpic/final.inc | 21 +++++++++++---------- detpic/mascan.asm | 16 ++++++++-------- detpic/morse.messages | 3 ++- detpic/panic.asm | 4 ++++ detpic/points.asm | 2 +- 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/detpic/final.inc b/detpic/final.inc index 643840b..d8c08c0 100644 --- a/detpic/final.inc +++ b/detpic/final.inc @@ -1,16 +1,17 @@ - include vectors.fin + include ../iwjpictest/syncwrite.inc + include detect.inc include i2clib.inc - include panic.fin - include routines-led.fin + include mascan.fin include misc.fin - include points.fin - include variables+vars.fin - include detect.inc - include ../iwjpictest/syncwrite.inc - include reverse.fin - include program.fin include nmra-stream.fin + include panic.fin + include points.fin include power.fin - include mascan.fin + include program.fin + include reverse.fin + include routines-led.fin + include serout.fin + include variables+vars.fin + include vectors.fin end diff --git a/detpic/mascan.asm b/detpic/mascan.asm index af518c0..4dfb201 100644 --- a/detpic/mascan.asm +++ b/detpic/mascan.asm @@ -16,7 +16,7 @@ cbyte res 1 ; 1000 0000 we're expecting an extra byte ;---------------------------------------------------------------------- -slavetable_section udata 0x280 +slavetable_section udata 0x400 ste_szln2 equ 3 ; each entry is a number of bytes, at these offsets: @@ -81,8 +81,8 @@ read_got_first_detectors ; b = MdBBdddd mov_lw 0x4f ; W = 01001111 and_wff b ; b = 0d00dddd mov_fw POSTINC1 ; W = detbasel; FSR1 -> lastd0 - rcall read_prep_detectbyte ; b = 0d00dddd - ; u = 0C00CCCC + rcall read_got_detectbyte_prep ; b = 0d00dddd + ; u = 0C00CCCC bt_f_if1 b, 6 ; b bit .d...... bs_f b, 4 ; b = 0d0ddddd ; ^ ^ copies of same bit @@ -100,7 +100,7 @@ read_got_first_reversers mov_wf cbyte ; cbyte = M0000000 bc_f b, 7 ; b = 00dddddd mov_fw POSTINC1 ; W = detbasel; FSR1 -> lastd0 - rcall read_prep_detectbyte + rcall read_got_detectbyte_prep goto addmsgs_revhead ;----- @@ -112,7 +112,7 @@ read_got_detectors_b1 ; b = dddddddd mov_fw POSTINC1 ; W = detbasel; FSR1 -> lastd0 inc_f FSR1L ; FSR1 -> lastd1 add_lw 5 ; W = detbasel+8 - rcall read_prep_detectbyte + rcall read_got_detectbyte_prep goto addmsgs_all ;---------- @@ -121,7 +121,7 @@ read_got_detectors_b2 ; b = dddddddd mov_fw POSTDEC1 ; W = detbasel; FSR1 -> flags bs_f FSR1L, 2 ; FSR1L -> lastd2 add_lw 13 ; W = detbasel+16 - rcall read_prep_detectbyte + rcall read_got_detectbyte_prep goto addmsgs_all ;---------- @@ -219,7 +219,7 @@ i2c_arrange_something ; GENERATION OF DETECTION MESSAGES FOR HOST - MAD BT_F_IF1 TABLES addmsg_testbit macro bit - bt_f_if1 u, bit fixme need to test something other than w ! + bt_f_if1 u, bit rcall addmsg_one endm @@ -292,7 +292,7 @@ addmsg_one ; other conditions on entry and exit as for entry to addmsgs_, above rr_fw TOSL ; W = 0???bbb0 rr_w ; W = 00???bbb - ior_fw 0xf8 ; W = 11111bbb + ior_wfw 0xf8 ; W = 11111bbb mov_wf FSR0L ; FSR0L = 11111bbb clr_f FSR0H ; FSR0 -> bitnum2bit[bbb] add_wfw t ; W = adjdetbasel + 11111bbb diff --git a/detpic/morse.messages b/detpic/morse.messages index 584e45a..495fb4a 100644 --- a/detpic/morse.messages +++ b/detpic/morse.messages @@ -20,6 +20,7 @@ # Miscellaneous E ; `expected'; we were told to panic +T ; master paniced because slave paniced # Regarding communications from the host HX ::t ; host sent unknown command @@ -31,7 +32,7 @@ HB ; data for host overran buffer # Regarding communications by master with slaves MX ; slave (or intern) sent bad extra byte -MR mascan::b,mascan::cslot ; reversers set byte with zz bit set +MR mascan:b,mascan:cslot ; reversers set byte with zz bit set MD ; i2cmu_done ! # Problematic interrupts diff --git a/detpic/panic.asm b/detpic/panic.asm index ffbe7ec..151e0d2 100644 --- a/detpic/panic.asm +++ b/detpic/panic.asm @@ -392,6 +392,10 @@ panic_crashread_commanded bs_f panicst, panicst_acked ; since we were asked to panic morse_E +;---------- +got_aargh + panic morse_T + ;---------- i2csu_read_begin_panicd mov_lw 0x80 ; M0000000 diff --git a/detpic/points.asm b/detpic/points.asm index cd9aedb..4a08751 100644 --- a/detpic/points.asm +++ b/detpic/points.asm @@ -234,6 +234,6 @@ point_timer_init_endif_masterslave cdu_init panic morse_UCI ; For master pic only. Sorts out the CDU's pin. -cdu_got_pointed panic morse_UCP +got_pointed panic morse_UCP include final.inc -- 2.30.2