make point init work; change maxfoo to maxfoos

diff --git a/detpic/pindata.inc b/detpic/pindata.inc
index e17b8ee13fa2ce7b887eace2fba8838c88e244ee..b53ae9ad13c6552b12d1f023e6c43896c7a59572 100644 (file)
--- a/detpic/pindata.inc
+++ b/detpic/pindata.inc
@@ -7,8 +7,8 @@ bkptix2portnumbitnum    equ     0x6000
 pic2detinfo            equ     0x6040
 picno2revmasks         equ     0x6080
 
-maxpic_ln2             equ     5
-maxpic                 equ     1 << maxpic_ln2
+maxpics_ln2            equ     5
+maxpics                        equ     1 << maxpics_ln2
 
-maxpoint_ln2           equ     5
-maxpoint               equ     1 << maxpoint_ln2
+maxpoints_ln2          equ     5
+maxpoints              equ     1 << maxpoints_ln2

diff --git a/detpic/points.asm b/detpic/points.asm
index 4e5fa49bda89aede741236d60bc023520430778b..3d34d6854597860afb531c7c0c400c8c38015635 100644 (file)
--- a/detpic/points.asm
+++ b/detpic/points.asm
@@ -12,7 +12,7 @@
 
 ptix2bitlat equ 0x300
 ptix2bitlat_section udata ptix2bitlat
- res maxpoint * 2      ; bit and LAT*
+ res maxpoints * 2     ; bit and LAT*
                        ; for unused point, 0x00 and 0x00
 
  udata_acs
@@ -143,9 +143,9 @@ points_local_init
        mov_lfsr ptix2bitlat-1, 0 ; FSR0 -> this bit and LAT*
                                  ;  points just at last thing we've filled in
 
-       load_perpic_tblptr picno2ptmap, maxpoint/8
+       load_perpic_tblptr picno2ptmap, maxpoints/8
 
-       mov_lw  maxpoint/8
+       mov_lw  maxpoints/8
        mov_wf  t               ; t = byte counter
 ;...
 points_init_byte_loop
@@ -170,7 +170,7 @@ points_init_bit_loop
 
        mov_lw  bkptix2portnumbitnum & 0xff
        bt_f_if0 idloc1,idloc1_boarddet
-       add_lw  maxpoint
+       add_lw  maxpoints
        mov_wf  TBLPTRL
 
        mov_lw  bkptix2portnumbitnum >> 8
@@ -181,7 +181,7 @@ points_init_bit_loop
        mov_lfsr bitnum2bit+7, 1 ; FSR1 -> bitnum2bit+7
        mov_lfsr ptix2bitlat, 0 ; FSR0 -> this bit (and LAT*)
 
-       mov_lw  maxpoint
+       mov_lw  maxpoints
        mov_wf  t               ; t = loop counter
 ;...
 points_init_portbit_loop
@@ -194,7 +194,7 @@ points_init_portbit_if_used
        mov_fw  TABLAT
        bra_n   point_initing_bad_point
        
-       ior_wff 0xf0            ; W -> bit value for bit
+       ior_lw  0xf8            ; W -> bit value for bit
        mov_wf  FSR1L           ; FSR1 -> bit value for bit
 
        swap_fw TABLAT          ; W = bitnum4 || portnum4

diff --git a/detpic/reverse.asm b/detpic/reverse.asm
index 410280dfe534b64167b8e41095c6349099c7de4c..c3a90791e0c4920222f455a97d8f0114a104689e 100644 (file)
--- a/detpic/reverse.asm
+++ b/detpic/reverse.asm
@@ -14,7 +14,7 @@ maske                         res     1
 ; MASTER - Access bank variables and other sections
 
  udata
-polarities_commanded_buffer    res     maxpic+1
+polarities_commanded_buffer    res     maxpics+1
        ; Each byte is:
        ;       11RRRRRRR       reverse command for slave, waiting to write
        ;       000000001       that pic is not a reversers pic

diff --git a/layout/data2safety b/layout/data2safety
index 5ce10affdbe700ca71958a0f3560f8cb00cf4c81..50e7a63f41ed6ae11d336ce8c6bcbaa8b0da1647 100755 (executable)
--- a/layout/data2safety
+++ b/layout/data2safety
@@ -485,7 +485,7 @@ sub o_section_end_fill ($$$) {
     } else {
        o("\n");
     }
-    o(sprintf " fill %s, %d*(maxpic-%d)\n\n",
+    o(sprintf " fill %s, %d*(maxpics-%d)\n\n",
       $fillvalue, $entrysize, $lastnumdone);
 }