# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1632444432 0
# Node ID 82665effff306f5caea1395f2bc5db08af348f84
# Parent  4dd30fac59338aae6dd2263dc067db6f7396492c
keypad boot init overhaul: handle initially held-down keys

This change fixes two previous behavioural defects:

1) On Compal phones, the PWR key had to be released before the boot
   sequence would proceed at all - it was stuck in an endless IRQ loop
   at the point of Nucleus enabling interrupts, before anything else.

2) On both Compal and sane platforms including Luna, if some regular
   non-PWR key was held down at boot time, the boot sequence would
   proceed and complete normally, but all non-PWR keypad buttons would
   be dead for the remainder of that boot cycle.

The fix is a generic solution - no Compal-specific hack ended up being
needed for the special case of their idiotic PWON-to-ROW4 hw wiring.

diff -r 4dd30fac5933 -r 82665effff30 src/cs/drivers/drv_app/kpd/board/kpd_scan_functions.c
--- a/src/cs/drivers/drv_app/kpd/board/kpd_scan_functions.c	Thu Sep 23 23:42:41 2021 +0000
+++ b/src/cs/drivers/drv_app/kpd/board/kpd_scan_functions.c	Fri Sep 24 00:47:12 2021 +0000
@@ -11,9 +11,9 @@
 /*
  * History:
  *
- *	Date       	Author       Modification
+ *  Date	Author       Modification
  *  ------------------------------------
- *  10/10/2001 L Sollier    Create
+ *  10/10/2001  L Sollier    Create
  *
  *
  * (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved
@@ -274,6 +274,13 @@
 
 #endif
 
+/*
+ * FreeCalypso change: we remove keypad interrupt unmasking
+ * from this point in the boot process, and instead our call
+ * to kpd_wait_for_key_release() at the beginning of kpd_core()
+ * will unmask interrupts after getting to a clear state first.
+ */
+#if 0
    /* Activate all outputs */
    *(volatile UINT16*) KP_COL_OUT = KP_ALL_ON;
 
@@ -285,6 +292,7 @@
    #else
      IQ_Unmask (IQ_ARMIO);
    #endif
+#endif
 }
 
 
diff -r 4dd30fac5933 -r 82665effff30 src/cs/drivers/drv_app/kpd/kpd_task.c
--- a/src/cs/drivers/drv_app/kpd/kpd_task.c	Thu Sep 23 23:42:41 2021 +0000
+++ b/src/cs/drivers/drv_app/kpd/kpd_task.c	Fri Sep 24 00:47:12 2021 +0000
@@ -21,6 +21,7 @@
 
 #include "kpd/kpd_env.h"
 #include "kpd/kpd_i.h"
+#include "kpd/kpd_process_internal_msg.h"  /* for kpd_wait_for_key_release() */
 
 #include "rv/rv_general.h"
 #include "rvf/rvf_api.h"
@@ -49,6 +50,8 @@
    UINT16 received_event;
 
    KPD_SEND_TRACE("KPD: Initialization", RV_TRACE_LEVEL_DEBUG_HIGH);
+   /* FreeCalypso addition */
+   kpd_wait_for_key_release();
 
    /* loop to process messages */
    while (error_occured == FALSE)
@@ -85,4 +88,4 @@
    }
 
    return RV_OK;
-}
\ No newline at end of file
+}
diff -r 4dd30fac5933 -r 82665effff30 src/cs/system/main/init.c
--- a/src/cs/system/main/init.c	Thu Sep 23 23:42:41 2021 +0000
+++ b/src/cs/system/main/init.c	Fri Sep 24 00:47:12 2021 +0000
@@ -974,6 +974,19 @@
  */
 void Init_Unmask_IT (void)
 {
+	/*
+	 * FreeCalypso change: we mask the keypad interrupt,
+	 * counteracting IQ_ARMIO unmasking below, and leave it masked
+	 * until KPD full initialization.
+	 *
+	 * This change is needed in order to handle user-expected initial
+	 * hold-down of the PWR key on Compal phones, and it also helps us
+	 * more gracefully handle the case of a user holding down some
+	 * random non-PWR key on boot.
+	 */
+	AI_MaskIT(ARMIO_MASKIT_KBD);
+
+	/* original code from TI */
 	IQ_Unmask(IQ_FRAME);
 	IQ_Unmask(IQ_UART_IRDA_IT);
 	IQ_Unmask(IQ_UART_IT);