X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_pyro.c;h=c01c951216c8db71d0d05025b4e4664174392abe;hb=684741765117611b7d666efbdfafd87c6199752c;hp=3c872354ba5fa7ccb1b7c7dca29be32cb40fc23d;hpb=327b765962d397efd4c45b6209c9225a4d23ba1d;p=fw%2Faltos

diff --git a/src/kernel/ao_pyro.c b/src/kernel/ao_pyro.c
index 3c872354..c01c9512 100644
--- a/src/kernel/ao_pyro.c
+++ b/src/kernel/ao_pyro.c
@@ -38,8 +38,8 @@
 enum ao_igniter_status
 ao_pyro_status(uint8_t p)
 {
-	__xdata struct ao_data packet;
-	__pdata int16_t value;
+	struct ao_data packet;
+	int16_t value;
 
 	ao_arch_critical(
 		ao_data_get(&packet);
@@ -160,14 +160,14 @@ ao_pyro_ready(struct ao_pyro *pyro)
 #endif
 
 		case ao_pyro_time_less:
-			if ((int16_t) (ao_time() - ao_boost_tick) <= pyro->time_less)
+			if ((int16_t) (ao_time() - ao_launch_tick) <= pyro->time_less)
 				continue;
-			DBG("time %d > %d\n", (int16_t)(ao_time() - ao_boost_tick), pyro->time_less);
+			DBG("time %d > %d\n", (int16_t)(ao_time() - ao_launch_tick), pyro->time_less);
 			break;
 		case ao_pyro_time_greater:
-			if ((int16_t) (ao_time() - ao_boost_tick) >= pyro->time_greater)
+			if ((int16_t) (ao_time() - ao_launch_tick) >= pyro->time_greater)
 				continue;
-			DBG("time %d < %d\n", (int16_t)(ao_time() - ao_boost_tick), pyro->time_greater);
+			DBG("time %d < %d\n", (int16_t)(ao_time() - ao_launch_tick), pyro->time_greater);
 			break;
 
 		case ao_pyro_ascending:
@@ -205,9 +205,9 @@ ao_pyro_ready(struct ao_pyro *pyro)
 		default:
 			continue;
 		}
-		return FALSE;
+		return false;
 	}
-	return TRUE;
+	return true;
 }
 
 #ifndef AO_FLIGHT_TEST
@@ -404,7 +404,7 @@ ao_pyro(void)
 	ao_exit();
 }
 
-__xdata struct ao_task ao_pyro_task;
+struct ao_task ao_pyro_task;
 
 
 static void
@@ -484,10 +484,9 @@ ao_pyro_set(void)
 	}
 #endif
 
-	ao_cmd_decimal();
+	p = ao_cmd_decimal();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	p = ao_cmd_lex_i;
 	if (AO_PYRO_NUM <= p) {
 		printf ("invalid pyro channel %d\n", p);
 		return;
@@ -516,25 +515,23 @@ ao_pyro_set(void)
 		}
 		pyro_tmp.flags |= ao_pyro_values[v].flag;
 		if (ao_pyro_values[v].offset != NO_VALUE) {
-			uint8_t negative = 0;
+			int16_t r = 1;
 			ao_cmd_white();
 			if (ao_cmd_lex_c == '-') {
-				negative = 1;
+				r = -1;
 				ao_cmd_lex();
 			}
-			ao_cmd_decimal();
+			r *= ao_cmd_decimal();
 			if (ao_cmd_status != ao_cmd_success)
 				return;
 			if (ao_pyro_values[v].flag & AO_PYRO_8_BIT_VALUE) {
-				if (negative) {
+				if (r < 0) {
 					ao_cmd_status = ao_cmd_syntax_error;
 					return;
 				}
-				*((uint8_t *) ((char *) &pyro_tmp + ao_pyro_values[v].offset)) = ao_cmd_lex_i;
+				*((uint8_t *) ((char *) &pyro_tmp + ao_pyro_values[v].offset)) = r;
 			} else {
-				if (negative)
-					ao_cmd_lex_i = -ao_cmd_lex_i;
-				*((int16_t *) (void *) ((char *) &pyro_tmp + ao_pyro_values[v].offset)) = ao_cmd_lex_i;
+				*((int16_t *) (void *) ((char *) &pyro_tmp + ao_pyro_values[v].offset)) = r;
 			}
 		}
 	}