X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_btm.c;h=44155ec142aa934863daa384500726f503a3af09;hp=db0ff6b09371508a67c806856e7ec21b4c2b27c3;hb=803bf106caf5d6b5ac12eb00a941647c7325edd1;hpb=44fb71ca3e5bccd5f601fc5a2d5da7292050b1d6

diff --git a/src/ao_btm.c b/src/ao_btm.c
index db0ff6b0..44155ec1 100644
--- a/src/ao_btm.c
+++ b/src/ao_btm.c
@@ -166,6 +166,10 @@ ao_btm(void)
 	 */
 	ao_delay(AO_SEC_TO_TICKS(3));
 
+#if HAS_BEEP
+	ao_beep_for(AO_BEEP_MID, AO_MS_TO_TICKS(200));
+#endif
+
 	/*
 	 * The first time we connect, the BTM-180 comes up at 19200 baud.
 	 * After that, it will remember and come up at 57600 baud. So, see
@@ -208,26 +212,50 @@ ao_btm(void)
 
 __xdata struct ao_task ao_btm_task;
 
+#if BT_LINK_ON_P2
+#define BT_PICTL_ICON	PICTL_P2ICON
+#define BT_PIFG		P2IFG
+#define BT_PDIR		P2DIR
+#define BT_PINP		P2INP
+#define BT_IEN2_PIE	IEN2_P2IE
+#endif
+#if BT_LINK_ON_P1
+#define BT_PICTL_ICON	PICTL_P1ICON
+#define BT_PIFG		P1IFG
+#define BT_PDIR		P1DIR
+#define BT_PINP		P1INP
+#define BT_IEN2_PIE	IEN2_P1IE
+#endif
+
 void
 ao_btm_check_link() __critical
 {
-	if (P2_1) {
+	/* Check the pin and configure the interrupt detector to wait for the
+	 * pin to flip the other way
+	 */
+	if (BT_LINK_PIN) {
 		ao_btm_connected = 0;
-		PICTL |= PICTL_P2ICON;
+		PICTL |= BT_PICTL_ICON;
 	} else {
 		ao_btm_connected = 1;
-		PICTL &= ~PICTL_P2ICON;
+		PICTL &= ~BT_PICTL_ICON;
 	}
 }
 
 void
 ao_btm_isr(void)
+#if BT_LINK_ON_P1
+	__interrupt 15
+#endif
 {
-	if (P2IFG & (1 << 1)) {
+#if BT_LINK_ON_P1
+	P1IF = 0;
+#endif
+	if (BT_PIFG & (1 << BT_LINK_PIN_INDEX)) {
 		ao_btm_check_link();
 		ao_wakeup(&ao_btm_connected);
 	}
-	P2IFG = 0;
+	BT_PIFG = 0;
 }
 
 void
@@ -236,18 +264,39 @@ ao_btm_init (void)
 	ao_serial_init();
 	ao_serial_set_speed(AO_SERIAL_SPEED_19200);
 
+#if BT_LINK_ON_P1
+	/*
+	 * Configure ser reset line
+	 */
+
+	P1_6 = 0;
+	P1DIR |= (1 << 6);
+#endif
+
 	/*
 	 * Configure link status line
 	 */
 
-	/* Set P2_1 to input, pull-down */
-	P2DIR &= ~(1 << 1);
-	P2INP |= P2INP_MDP2_1_TRISTATE;
+	/* Set pin to input */
+	BT_PDIR &= ~(1 << BT_LINK_PIN_INDEX);
+
+	/* Set pin to tri-state */
+	BT_PINP |= (1 << BT_LINK_PIN_INDEX);
 
-	/* Enable P2 interrupts */
-	IEN2 |= IEN2_P2IE;
+	/* Enable interrupts */
+	IEN2 |= BT_IEN2_PIE;
+
+	/* Check current pin state */
 	ao_btm_check_link();
+
+#if BT_LINK_ON_P2
+	/* Eable the pin interrupt */
 	PICTL |= PICTL_P2IEN;
+#endif
+#if BT_LINK_ON_P1
+	/* Enable pin interrupt */
+	P1IEN |= (1 << BT_LINK_PIN_INDEX);
+#endif
 
 	ao_add_task(&ao_btm_task, ao_btm, "bt");
 }