Refactored 16 bit division by two into seperate macro #112 (#119)

bird-sanctuary · Jun 19, 2023 · 4901cde · 4901cde
1 parent d799538
commit 4901cde
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/Modules/Macros.asm b/src/Modules/Macros.asm
@@ -253,3 +253,9 @@ Divide_By_4 MACRO ih,il,oh,ol
     rrc  A
     mov  ol, A
 ENDM
+
+Divide_16Bit_By_2 MACRO hi, lo
+    clr  C
+    rrca hi
+    rrca lo
+ENDM
diff --git a/src/Modules/Timing.asm b/src/Modules/Timing.asm
@@ -168,9 +168,7 @@ calc_next_comm_div_8_2:
     Divide_11Bit_By_8 Temp4, Temp3, Temp5
     mov  Temp6, #0
 
-    clr  C                              ; Divide by 2
-    rrca Temp2
-    rrca Temp1
+    Divide_16Bit_By_2 Temp2, Temp1
 
     sjmp calc_next_comm_average_and_update
 
@@ -180,9 +178,7 @@ calc_next_comm_div_8_2_slow:
     ; Divide Temp4/3 by 8 and store in Temp6/5
     Divide_By_8 Temp4, Temp3, Temp6, Temp5
 
-    clr  C                              ; Divide by 2
-    rrca Temp2
-    rrca Temp1
+    Divide_16Bit_By_2 Temp2, Temp1
 
     sjmp calc_next_comm_average_and_update
 
@@ -549,13 +545,9 @@ setup_zc_scan_timeout:
 
     mov  Temp1, Comm_Period4x_L         ; Set long timeout when starting
     mov  Temp2, Comm_Period4x_H
-    clr  C
-    rrca Temp2
-    rrca Temp1
+    Divide_16Bit_By_2 Temp2, Temp1
 IF MCU_TYPE == MCU_BB1
-    clr  C
-    rrca Temp2
-    rrca Temp1
+    Divide_16Bit_By_2 Temp2, Temp1
 ENDIF
     jnb  Flag_Startup_Phase, setup_zc_scan_timeout_startup_done