+/*
+ * Copyright © 2011, 2012, Titanium Mirror, Inc..
+ * All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * - Neither the name of Titanium Mirror, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
/*
* File: isr.c
*
#include <htc.h>
#include "tmr.h"
+#include "tmr32.h"
#include "btn.h"
#include "task.h"
-bit isr_gie; /* Used to store the state of GIE for nested ndi()/nei() */
-unsigned char isr_di; /* Count of nested ndi() */
+bit _isr_gie; /* Used to store the state of GIE for nested ndi()/nei() */
+unsigned char _isr_di; /* Count of nested ndi() */
+
+void ndi()
+{
+ if (_isr_di++ == 0) {
+ _isr_gie = GIE;
+ di();
+ }
+}
+
+/* Nested enable interrupts inline function. Should be OK even in ISR. */
+void nei()
+{
+ if (--_isr_di == 0 && _isr_gie)
+ ei();
+}
+/* Application specific interrupt handler. List the isr functions for all
+ * modules used, plus any additional application specific ISR processing.
+ */
void interrupt isr()
{
tmr_isr();
btn_isr();
+ tmr32_isr();
- if (tmr_fired(TMR_AUTO_OFFON))
- _task_post(TASK_AUTO_OFFON);
+ if (tmr_fired(TMR_BTN_PB_HELD))
+ task_post(TASK_BTN_PB_HELD);
if (tmr_fired(TMR_FADE))
- _task_post(TASK_FADE);
+ task_post(TASK_FADE);
if (tmr_fired(TMR_INCOLOR))
- _task_post(TASK_INCOLOR);
-#if 0
- if (tmr_fired(TMR_DIM))
- _task_post(TMR_DIM);
-#endif
+ task_post(TASK_INCOLOR);
+ if (tmr_fired(TMR_CANDLE))
+ task_post(TASK_CANDLE);
+ if (tmr_fired(TMR_CFG))
+ task_post(TASK_CFG);
}