msp4th: remove macro

diff --git a/msp4th/bootrom.rcf b/msp4th/bootrom.rcf
index 162b5e2bbff7cd2ee158eca47a6ab31143ba1fd9..573d42ce7b782a26ce86bfe2246b7ce1f26f6c2a 100644 (file)
--- a/msp4th/bootrom.rcf
+++ b/msp4th/bootrom.rcf
@@ -159,10 +159,10 @@
 0001001010110000
 0011000110100000
 0001001010110000
-0011110001000110
+0011110001101100
 0011111111001111
 0100000000110000
-0011111111010000
+0011111111111110
 0100000000110001
 1111111100000000
 0100000000110000
@@ -286,15 +286,14 @@
 0001001010010010
 0100000000010000
 0100111101001011
-0100001000011110
+1001001110000010
 0100000000001100
-1001001100001110
-0010010000010001
+0010010000010100
 1001001001111111
 0010000000001111
 1001001000011001
 0100000000001010
-0011010000100010
+0011010000001100
 0001001010010010
 0100000000000010
 0100000001111111
@@ -306,29 +305,7 @@
 0100000000000010
 0101001110110010
 0100000000001010
-0011110000111110
-1001001101111011
-0010010000000010
-1001001001101011
-0010000000010000
-1001001110000010
-0100000000001010
-0010000000001101
-0100001110010010
-0100000000000100
-0100001000011111
-0100000000000000
-0100000011111111
-0000000001111000
-0000000000000000
-0100001000011111
-0100000000000000
-0100000011111111
-0000000000100000
-0000000000000001
-0011110000101100
-1001001100001110
-0010010000000011
+0011110000101000
 0100101101001111
 0001001010010010
 0100000000000010
@@ -370,8 +347,8 @@
 0100001111001111
 0000000000000000
 1001001100001010
-0010001110101000
-0100001110000010
+0010001110111111
+0100101010000010
 0100000000001010
 0100000100111001
 0100000100111010
@@ -402,34 +379,34 @@
 0100000100110000
 0001001000001011
 0001001010110000
-0011001011110110
+0011001011001000
 0100000001111011
 0000000000100000
 0011110000000010
 0001001010110000
-0011001011110110
+0011001011001000
 1001111101001011
 0010111111111100
 0100000100111011
 0100000100110000
 0001001010110000
-0011001011110110
+0011001011001000
 1001000001111111
 0000000000101001
 0010001111111011
 0001001010110000
-0011001100100100
+0011001011110110
 0100000100110000
 0001001000001011
 0001001000001010
 0011110000000101
 0001001010110000
-0011001100111100
+0011001100001110
 0011110000000100
 0001001010110000
 0011001000001110
 0001001010110000
-0011001100100100
+0011001011110110
 1001000001111111
 0000000000101000
 0010011111110110
@@ -451,7 +428,7 @@
 0100001111001111
 0000000000000000
 0001001010110000
-0011001011110110
+0011001011001000
 1001111101001010
 0010110000000011
 1001001000011011
@@ -461,11 +438,11 @@
 0100000100111011
 0100000100110000
 0100000000111111
-0011110010101000
+0011110011001110
 0001001010010010
 0100000000011000
 0100000000111111
-0011110111010000
+0011110111111110
 0001001010010010
 0100000000011000
 0100001000011111
@@ -499,75 +476,41 @@
 0001001000001010
 0001001000001001
 0001001000001000
-0001001000000101
-0001001000000100
-0100111100001000
-0100001100011100
-0100001100001111
-0100111100001011
-0100111100001101
-0100000001110100
-0000000000100000
-0011110000110100
-0100100000000101
-0101101100000101
-0100010101100101
-1001001101000101
-0010010000011010
-1001000001111010
-0000000000100000
-0010000000001001
-0101001100011100
-0100100101101010
-0011110000000001
-0101001100011101
-0100111000001011
-0101110100001011
-1001101101101010
-0010101111111011
-0011110000100001
-1001010101001010
-0010000000000100
-0101001100011011
-0011110000011110
-0101001100011101
-0011110000000010
-0100000001111010
+0100001100011011
+0100001100001100
+0100110000001101
+0100000001111000
 0000000000100000
-0100111000001011
-0101110100001011
-1001101101101010
-0010101111111000
+0011110000010101
+0100111100001001
+0101110000001001
+0100100101101001
+1001001101001001
+0010010000000100
+1001100101001010
+0010000000000101
 0101001100011100
-0011110000010011
+0011110000001011
 1001000001111010
 0000000000100000
-0010000000001001
-0011110000000001
-0101001100011101
-0100111000001111
-0101110100001111
-1001001111001111
-0000000000000000
-0010001111111010
-0100110000001111
-0011110000001000
-0101001100011100
+0010010000010000
+0101001100011011
 0011110000000001
 0101001100011101
-0100111000001011
-0101110100001011
-1001101101100100
+0100111000001100
+0101110100001100
+1001110001101000
 0010101111111011
-0100001100001011
+0100001100001100
 0101001100011101
-0100111000001001
-0101110100001001
-0100100101101010
+0100111000001010
+0101110100001010
+0100101001101010
 1001001101001010
-0010001111000111
-0100000100110100
-0100000100110101
+0010001111100110
+0100001100001111
+0011110000000001
+0100101100001111
 0100000100111000
 0100000100111001
 0100000100111010
@@ -579,10 +522,10 @@
 0100001000011010
 0100000000000110
 0100000000111110
-0011110010101000
+0011110011001110
 0100101000001111
 0001001010110000
-0011001111100010
+0011001110110100
 0100111100001001
 1001001100001111
 0010010000000011
@@ -590,10 +533,10 @@
 0100111000100000
 0011110000010010
 0100000000111110
-0011110111010000
+0011110111111110
 0100101000001111
 0001001010110000
-0011001111100010
+0011001110110100
 0100111100001011
 1001100100001111
 0010010000000011
@@ -604,20 +547,90 @@
 0100000000011110
 0100101000001111
 0001001010110000
-0011001111100010
+0011001110110100
 1001101100001111
 0010010000000011
 0001001010110000
-0011001111000010
+0011001110010100
 0100001100011111
 0001001010110000
-0011001111000010
+0011001110010100
 0100000100111001
 0100000100111010
 0100000100111011
 0100000100110000
 0001001000001011
 0001001000001010
+0001001010110000
+0011001110001000
+1001000000111111
+0100111000100000
+0011100000000101
+0101000000111111
+1011000111100000
+0100000000111011
+0011110011001110
+0011110000001010
+1001000000111111
+0010011100010000
+0011100000000101
+0101000000111111
+1101100011110000
+0100000000111011
+0011110111111110
+0011110000000010
+0100001000011011
+0100000000011110
+0100001100011110
+0100000001111101
+0000000000011111
+0011110000000100
+0101001100011011
+1001101101101101
+0010101111111101
+0101001100011110
+1001111100001110
+0011101111111011
+1001001111001011
+0000000000000000
+0010000000000101
+0011110000001010
+0101001100011011
+0001001010010010
+0100000000000010
+0011110000000010
+0100000001111010
+0000000000100000
+0100101101101111
+1001111101001010
+0010101111110111
+0011110000000100
+0100000001111111
+0000000000111111
+0001001010010010
+0100000000000010
+0100000001111111
+0000000000100000
+0001001010010010
+0100000000000010
+0100000100111010
+0100000100111011
+0100000100110000
+0100011000101110
+1001000000111110
+0010011100010000
+0011100000000011
+0100001110000110
+0000000000000000
+0100000100110000
+0101111000001110
+0101001000011110
+0100000000100000
+0100111010100110
+0000000000000000
+0100000100110000
+0001001000001011
+0001001000001010
 0100001000011111
 0100000000000110
 0100111101101101
@@ -698,10 +711,10 @@
 0011110000000001
 0100001100011011
 0001001010110000
-0011001111000010
+0011001110010100
 0100101100001111
 0001001010110000
-0011001111000010
+0011001110010100
 0100000100111010
 0100000100111011
 0100000100110000
@@ -714,7 +727,7 @@
 0100111000001101
 0101110100001101
 0101000000111101
-1110111111000010
+1110111111110000
 0011110000000100
 0100111000001101
 0101110100001101
@@ -727,7 +740,7 @@
 1001001100011111
 0010010000000100
 0001001010110000
-0011001110110110
+0011001110001000
 1001001100001111
 0010000000000010
 0100101110000010
@@ -775,7 +788,7 @@
 0100111000001111
 0101111100001111
 0101000000111111
-1110111111000010
+1110111111110000
 0011110000000100
 0100111000001111
 0101111100001111
@@ -786,12 +799,7 @@
 0100111010000010
 0100000000011100
 0001001010110000
-0011001111000010
-0100000100110000
-0100011000011111
-0000000000000010
-0001001010110000
-0011001111000010
+0011001110010100
 0100000100110000
 0100001100001101
 0011110000000111
@@ -829,7 +837,7 @@
 0100001000011111
 0100000000000110
 0001001010110000
-0011001111100010
+0011001110110100
 0101111100001111
 0101001000011111
 0100000000100000
@@ -859,7 +867,7 @@
 0100000000111010
 0000000000001010
 0001001010110000
-0011111100001010
+0011111100111000
 0101000001111110
 0000000000110000
 0100111011001000
@@ -868,7 +876,7 @@
 0100000000111010
 0000000000001010
 0001001010110000
-0011111100001010
+0011111100111000
 0100110000001111
 0101001100011001
 1001001100001100
@@ -917,10 +925,10 @@
 1100001100010010
 0001000000001111
 0001001010110000
-0011011100000010
+0011011100010010
 0100101100001111
 0001001010110000
-0011011100000010
+0011011100010010
 0100000100111011
 0100000100110000
 0001001000001011
@@ -930,10 +938,10 @@
 0001000110001110
 0100111000001111
 0001001010110000
-0011011100011010
+0011011100101010
 0100101100001111
 0001001010110000
-0011011100011010
+0011011100101010
 0100000100111011
 0100000100110000
 0001001000001011
@@ -942,102 +950,104 @@
 0001001000001000
 0101001100111111
 1001000000111111
-0000000001001100
+0000000001001110
 0010100000000010
 0100000000110000
-0011101111111000
+0011110000011110
 0101111100001111
 0100111100010000
-0011011101101110
-0011100000000110
-0011100000001110
-0011100000010100
-0011100000100000
-0011100001000000
-0011100001010110
-0011100001100010
-0011100000011000
-0011100001100110
-0011100001111000
-0011100010000110
-0011100010010010
-0011100010101100
-0011100010110110
-0011100010111110
-0011100011000110
-0011100011011110
-0011100011111100
-0011100100001100
-0011100100100010
-0011100100111000
-0011100101000000
-0011101111111000
-0011101111111000
-0011100101000100
-0011100101001010
-0011100101100110
-0011100110010010
-0011101111111000
+0011011101111110
+0011100000011010
+0011100000100010
+0011100000101000
+0011100000110100
+0011100001010100
+0011100001101010
+0011100001110110
+0011100000101100
+0011100001111010
+0011100010001100
+0011100010011010
+0011100010100110
+0011100011000000
+0011100011001010
+0011100011010010
+0011100011011010
+0011100011110010
+0011100100010000
+0011100100100000
+0011100100110110
+0011100101001100
+0011100101010100
+0011110000011110
+0011110000011110
+0011100101011000
+0011100101011110
+0011100101111010
 0011100110100110
-0011100110101110
-0011100110110010
-0011100110111100
+0011110000011110
+0011100110111010
 0011100111000010
-0011100111001000
-0011100111001110
-0011100111010100
+0011100111000110
+0011100111010000
 0011100111011000
-0011100111100010
+0011100111100000
+0011100111101000
 0011100111101110
-0011100111111000
-0011101000000100
-0011101000010110
-0011101000011100
-0011101000111100
-0011101001000000
-0011101001001010
-0011101001010000
+0011100111110010
+0011100111111100
+0011101000001000
+0011101000010010
+0011101000011110
+0011101000110000
+0011101000110110
 0011101001010110
-0011101001011100
-0011101001100010
-0011101001101000
-0011101001101110
-0011101001110100
-0011101010110010
-0011101010111010
-0011101011001000
-0011101011001110
-0011101011010010
-0011101011011100
+0011101001011010
+0011101001100100
+0011101001101010
+0011101001110000
+0011101001110110
+0011101001111100
+0011101010000010
+0011101010001000
+0011101010001110
+0011101011001100
+0011101011010100
+0011101011100010
+0011101011101000
 0011101011101100
-0011101100000010
-0011101100011110
-0011101100111100
-0011101101000010
-0011101101000110
-0011101101011010
-0011101101100100
-0011101101110000
-0011101110000100
-0011101110010010
-0011101110100010
-0011101110110110
-0011101111010010
-0011101111011110
-0011101111101000
+0011101011110110
+0011101100000110
+0011101100011100
+0011101100111000
+0011101101010110
+0011101101011100
+0011101101100000
+0011101101110100
+0011101101111110
+0011101110001010
+0011101110011110
+0011101110101100
+0011101110111100
+0011101111010000
+0011101111101100
+0011101111111000
+0011110000000010
+0011110000010100
+0011110000011010
 0100001110010010
 0100000000000100
 0100000000110000
-0011101111111000
+0011110000011110
 0101011010100110
 0000000000000010
 0011110000000010
 1000011010100110
 0000000000000010
 0001001010110000
-0011001110110110
+0011001110001000
 0100000000110000
-0011101111111000
+0011110000011110
 1100001000110010
 0100011000001110
 0101001100101110
@@ -1053,24 +1063,24 @@
 0000000000000000
 1101001000110010
 0100000000110000
-0011101111111000
+0011110000011110
 0100011000011100
 0000000000000010
 0100011000101010
 0001001010110000
-0011111100100110
+0011111101010100
 0100110010000110
 0000000000000010
 0100111010000110
 0000000000000000
 0100000000110000
-0011101111111000
+0011110000011110
 0001001010110000
-0011001110110110
+0011001110001000
 0001001010110000
-0011011010001110
+0011011010011110
 0100000000110000
-0011101111111000
+0011110000011110
 0100011000101111
 0011110010010010
 0100011000101101
@@ -1081,58 +1091,58 @@
 0100110110001110
 0000000000000000
 0100000000110000
-0011101111111000
+0011110000011110
 0001001010110000
-0011001110110110
+0011001110001000
 0100011000001110
 1001111110000110
 0000000000000000
 0011010000010000
 0011110000001011
 0001001010110000
-0011001110110110
+0011001110001000
 0100011000001110
 1001011000101111
 0011010000001010
 0011110000000101
 0001001010110000
-0011001110110110
+0011001110001000
 0100011000001110
 1001011000101111
 0010000000000100
 0100001110011110
 0000000000000000
 0100000000110000
-0011101111111000
+0011110000011110
 0100001110001110
 0000000000000000
 0100000000110000
-0011101111111000
+0011110000011110
 0001001010110000
-0011001110110110
+0011001110001000
 0001001010110000
-0011011100011010
+0011011100101010
 0011110001110010
 0001001010110000
-0011001101001100
+0011001100011110
 0100000000110000
-0011101111111000
+0011110000011110
 0001001010110000
-0011011000110110
+0011011001000110
 0100000000110000
-0011101111111000
+0011110000011110
 0100011000101110
 1001001100001110
 0011100000000010
 0100000000110000
-0011101111111000
+0011110000011110
 1110001100111110
 0100111010000110
 0000000000000000
 0101001110010110
 0000000000000000
 0100000000110000
-0011101111111000
+0011110000011110
 0100001000011010
 0100000000100010
 0100101000001011
@@ -1140,14 +1150,14 @@
 0101001000011011
 0100000000001000
 0001001010110000
-0011001110110110
+0011001110001000
 0100111110001011
 0000000000000000
 0101001100011010
 0100101010000010
 0100000000100010
 0100000000110000
-0011101111111000
+0011110000011110
 0100011000101111
 0101111100001111
 0101001000011111
@@ -1155,52 +1165,52 @@
 0100111110100110
 0000000000000000
 0100000000110000
-0011101111111000
+0011110000011110
 0001001010110000
-0011001110110110
+0011001110001000
 0100111100001011
 0001001010110000
-0011001110110110
+0011001110001000
 0100101100001110
 0101111000001110
 0101001000011110
 0100000000001000
 0100000000110000
-0011101110011100
+0011101110110110
 1001001110000110
 0000000000000000
 0010010000000100
 0100001110000110
 0000000000000000
 0100000000110000
-0011101111111000
+0011110000011110
 0100001110010110
 0000000000000000
 0100000000110000
-0011101111111000
+0011110000011110
 0001001010110000
-0011001110011100
+0011001101101110
 0100000000110000
-0011101111111000
+0011110000011110
 0100001100001111
 0011110000111000
 0100001000011111
 0100000000011100
-0011110001110110
+0011110001111001
 0001001010110000
-0011001111001010
+0011001110011100
 0100111100001011
 0001001010110000
-0011001110110110
+0011001110001000
 1001001100001111
 0010010000000010
 0100000000110000
-0011101111111000
+0011110000011110
 1000001100100111
 0100101110000010
 0100000000011100
 0100000000110000
-0011101111111000
+0011110000011110
 0100001000011110
 0100000000010110
 0100111000001111
@@ -1220,125 +1230,128 @@
 0001000000001110
 0100111000001111
 0001001010110000
-0011001111000010
+0011001110010100
 0100000000110000
-0011101111111000
+0011110000011110
 0001001010110000
-0011001110110110
+0011001110001000
 0001001010110000
-0011011100111010
+0011011101001010
 0100000001111111
 0000000000100000
 0001001010010010
 0100000000000010
 0100000000110000
-0011101111111000
+0011110000011110
 0001001010110000
-0011010011010100
+0011010011101110
 0100000000110000
-0011101111111000
+0011110000011110
 0100001100001111
 0011111111101100
 0100001100011111
 0001001010110000
-0011010110000110
+0011010110100000
 0100000000110000
-0011101111111000
-0001001010110000
-0011110000000010
-0011110100011011
+0011110000011110
 0001001010110000
-0011010001111110
-0011110100011000
+0011110000101000
+0100000000110000
+0011110000011110
 0001001010110000
-0011011000000010
-0011110100010101
+0011010000001100
+0100000000110000
+0011110000011110
 0001001010110000
-0011011000101100
-0011110100010010
+0011011000011100
+0100000000110000
+0011110000011110
+0100011000011111
+0000000000000010
+0011111111011000
 0100001100011111
-0011111111011001
+0011111111010110
 0100001000011111
 0100000000000110
 0001001010010010
 0100000000011000
-0011110100001011
+0011110100010001
 0100001000011011
 0100000000000010
 0001001010110000
-0011001110110110
+0011001110001000
 0001001010001011
-0011110100000101
+0011110100001011
 0001001010110000
-0011001111001010
+0011001110011100
 0100111110000010
 0100000000011100
-0011110100000000
+0011110100000110
 0100011000101110
 1111000000111110
 1111111111111110
 0100111010100110
 0000000000000000
-0011110011111010
+0011110100000000
 0001001010110000
-0011001110110110
+0011001110001000
 0100111100001011
 0001001010110000
-0011001110110110
+0011001110001000
 0100101100001110
 1111000000111110
 1111111111111110
 0011110011000011
 0100001000011111
 0100000000100010
-0011111110110111
+0011111110110100
 0001001010110000
-0011001110110110
+0011001110001000
 0100111100001010
 0001001010110000
-0011001110110110
+0011001110001000
 0100001000011011
 0100000000011100
 0001001010110000
-0011001111010000
+0011001110100010
 0100101000001111
 0001001010110000
-0011001111010000
+0011001110100010
 0100101100001111
 0001001010110000
-0011001111010000
-0011110011011110
+0011001110100010
+0011110011100100
 0100001100011111
 0011110000000010
 0001001010110000
-0011001110110110
+0011001110001000
 0001001010110000
-0011010111000000
-0011110011010111
+0011010111011010
+0011110011011101
 0100011100011111
 0000000000000010
-0011111110011101
+0011111110011010
 0100011100011111
 0000000000001000
-0011111110011010
+0011111110010111
 0100011100011111
 0000000000001110
-0011111110010111
+0011111110010100
 1110001110110110
 0000000000000000
-0011110011001011
+0011110011010001
 1110011010100110
 0000000000000010
-0011111011011000
+0011111011010101
 1111011010100110
 0000000000000010
-0011111011010101
+0011111011010010
 1101011010100110
 0000000000000010
-0011111011010010
+0011111011001111
 1100001000110010
 0001001010110000
-0011001110110110
+0011001110001000
 0100111110000010
 0000000100110010
 0100011010010010
@@ -1360,34 +1373,34 @@
 0001000010001011
 0001000110001011
 0001001010110000
-0011111101011100
+0011111110001010
 0100110000001011
 0001001010110000
-0011001110110110
+0011001110001000
 0100101110000110
 0000000000000000
-0011110010100011
+0011110010101001
 0001001010010010
 0100000000010000
 0100111101001111
-0011111101101000
+0011111101100101
 0100000001111111
 0000000000001101
 0001001010010010
 0100000000000010
 0100000001111111
 0000000000001010
-0011111101101011
+0011111101101000
 0101011010100110
 0000000000000000
-0011110010010101
+0011110010011011
 0001000100100110
-0011110010010011
+0011110010011001
 0100011000001011
 0001001010100110
 0100111110001011
 0000000000000000
-0011110010001110
+0011110010010100
 0100011000001011
 0101001100101011
 0100101100101111
@@ -1395,7 +1408,7 @@
 0100111110001011
 0000000000000000
 0100000000110000
-0011100000011000
+0011100000101100
 0100011000001011
 0101001000101011
 0100011000011110
@@ -1437,72 +1450,72 @@
 0000000000000011
 0000000000000000
 0001001010110000
-0011001111011000
-0011110001011011
+0011001110101010
+0011110001100001
 0001000010000110
-0011110001011001
+0011110001011111
 0001001010110000
-0011001110110110
+0011001110001000
 0100111100001011
 0001001010110000
-0011001110110110
+0011001110001000
 0100101100001110
 0101111000001110
 0101111110001110
 0000000000000000
-0011110001001111
+0011110001010101
 0001001010110000
-0011001110110110
+0011001110001000
 0001001010110000
-0011010111101000
-0011110001001010
+0011011000000010
+0011110001010000
 0001001010110000
-0011001110110110
+0011001110001000
 0101111100001111
 0101011000001111
 0100111100101111
-0011111100001101
+0011111100001010
 0100011000011011
 0000000000000010
 0100011000101111
 0001001010110000
-0011001111000010
+0011001110010100
 0100011010100110
 0000000000000100
 0100101110000110
 0000000000000010
-0011110000111010
+0011110001000000
 0001001010110000
-0011001110110110
+0011001110001000
 0100011000001110
 1001111110000110
 0000000000000000
-0011010000110100
+0011010000111010
 0011110000000101
 0001001010110000
-0011001110110110
+0011001110001000
 0100011000001110
 1001011000101111
-0011010000101110
+0011010000110100
 0100111110001110
 0000000000000000
-0011110000101011
+0011110000110001
 0100001000011011
 0100000000010110
 0011110000000100
 0100101100101111
 0001001010110000
-0011011010001110
+0011011010011110
 1000001100101011
 1001011000001011
 0010111111111010
-0011110000100001
+0011110000100111
 0100001000011011
 0100000000010110
 0011110000001000
 0100101100101111
 0001001010110000
-0011011100111010
+0011011101001010
 0100000001111111
 0000000000100000
 0001001010010010
@@ -1510,26 +1523,32 @@
 1000001100101011
 1001011000001011
 0010111111110110
-0011110000010011
+0011110000011001
 0100011000101110
 1110001100111110
 0101001100011110
 0100111010000110
 0000000000000000
-0011110000001101
+0011110000010011
 0001001010110000
-0011001110110110
+0011001110001000
 0100111110000010
 0100000000001100
-0011110000001000
+0011110000001110
 0100001000011111
 0100000000000000
 0100001111001111
 0000000000000000
 0001001010110000
-0011001110110110
+0011001110001000
 0001001010110000
 0011000110100000
+0011110000000101
+0001001010110000
+0011010001100010
+0011110000000010
+0001001010110000
+0011010011010100
 0100000100111000
 0100000100111001
 0100000100111010
@@ -1537,7 +1556,7 @@
 0100000100110000
 0001001000001011
 0001001010110000
-0011001110110110
+0011001110001000
 0100111100001011
 1001000000111111
 0100111000100000
@@ -1545,7 +1564,7 @@
 0101000000111111
 1011000111100000
 0001001010110000
-0011011101010100
+0011011101100100
 0011110000010100
 1001000000111111
 0010011100010000
@@ -1553,15 +1572,15 @@
 0100001000011111
 0100000000011100
 0001001010110000
-0011001111010000
+0011001110100010
 0101101100001011
 0101000000111011
-1110111110111010
+1110111111101000
 0011110000000111
 0100001000011111
 0100000000011100
 0001001010110000
-0011001111010000
+0011001110100010
 0101101100001011
 0101001000011011
 0100000000100000
@@ -1584,7 +1603,7 @@
 0100111000001111
 0101111100001111
 0101000000111111
-1110111111000010
+1110111111110000
 0011110000000100
 0100111000001111
 0101111100001111
@@ -1601,10 +1620,10 @@
 0101000000111111
 1011000111100000
 0001001010110000
-0011011101010100
+0011011101100100
 0011110000001000
 0001001010110000
-0011001111010000
+0011001110100010
 0100101100001111
 0101111100001111
 0101001000011111
@@ -1765,6 +1784,10 @@
 0010000001101111
 0110111001101001
 0111010001101001
+0110111100100000
+0111011100110010
+0110111100100000
+0111000000110010
 0000000000100000
 0010000001011011
 0010000000111010
@@ -1951,7 +1974,7 @@
 0101001100011010
 1101001000111101
 0001001010110000
-0011111100001010
+0011111100111000
 0001000000001101
 1011001000101101
 0010100000000100
@@ -1982,7 +2005,7 @@
 0110001100001011
 1101001000111000
 0001001010110000
-0011111110100110
+0011111111010100
 0001000000001000
 1011001000101000
 0010010000001000
@@ -2023,26 +2046,3 @@
 0010001111110001
 0100000100110000
 0001001100000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000
-0000000000000000

diff --git a/msp4th/msp4th.c b/msp4th/msp4th.c
index c5fe102da78f6392c2515bbea46d861ff89d137c..96b8e5b1be5b5bc3533ae843c25e992fc785acbe 100644 (file)
--- a/msp4th/msp4th.c
+++ b/msp4th/msp4th.c
@@ -687,7 +687,6 @@ int16_t lookupToken(uint8_t *word, uint8_t *list)
     k = 0;
     n = 1;
 
-#define CONSUMETO(c) do { while (list[i] > c) { i++; } } while (0)
     while (list[i] != 0) {
         if ((word[j] != 0) && (list[i] == word[j])) {
             // keep matching
@@ -700,14 +699,15 @@ int16_t lookupToken(uint8_t *word, uint8_t *list)
         } else {
             j = 0;
             n++;
-            CONSUMETO(' ');
+            while (list[i] > ' ') {
+                i++;
+            }
         }
 
         i++;
     }
 
     return(k);
-#undef CONSUMETO
 }