Merge branch 'new/critical-section/9'

prog/makefile.json

@@ -2,5 +2,7 @@
 
   "TEENSY" : "3.6",
 
-  "CPU-MHZ" : 180
+  "CPU-MHZ" : 180,
+
+  "SECTION-SCHEME" : "disableInterrupt"
 }

prog/sources/setup-loop.cpp

@@ -1,55 +1,45 @@
 #include "all-headers.h"
 
-// Bit operation references
-const uint32_t bufferEmpty(0);
-const uint32_t bufferFull(~ bufferEmpty);
+static volatile uint32_t gCount1 = 0 ;
+static volatile uint32_t gCount2 = 0 ;
+static volatile uint32_t gCount3 = 0 ;
+static volatile uint32_t gCount4 = 0 ;
+static volatile bool gPerformCount = true ;
+
+static void rtISR (SECTION_MODE_ const uint32_t inUptime) {
+	if (gPerformCount) {
+		gCount1 += 1 ;
+		gCount2 += 1 ;
+		gCount3 += 1 ;
+		gCount4 += 1 ;
+	}
+}
 
-// Button variables
-uint32_t antiBlinkBuffer[5];
-bool buttonReleased[5];
-bool actionDone[5];
-DigitalPort LED[5];
-DigitalPort BUTTON[5];
+MACRO_REAL_TIME_ISR (rtISR) ;
 
-// Counter
-uint32_t counter(0);
+void section_incrementations(SECTION_MODE) {
+	gCount1 += 1 ;
+	gCount2 += 1 ;
+	gCount3 += 1 ;
+	gCount4 += 1 ;
+}
 
 void setup (USER_MODE) {
-	// Start
-	digitalWrite(L0_LED, true);
-
-	// Init buttons and LEDs
-	BUTTON[0] = P0_PUSH_BUTTON;
-	BUTTON[1] = P1_PUSH_BUTTON;
-	BUTTON[2] = P2_PUSH_BUTTON;
-	BUTTON[3] = P3_PUSH_BUTTON;
-	BUTTON[4] = P4_PUSH_BUTTON;
-
-	LED[0] = L0_LED;
-	LED[1] = L1_LED;
-	LED[2] = L2_LED;
-	LED[3] = L3_LED;
-	LED[4] = L4_LED;
-
-	for (unsigned int i(0); i < 5; i++) {
-		antiBlinkBuffer[i] = 0;
-		buttonReleased[i] = digitalRead(BUTTON[i]);
-		actionDone[i] = false;
-	}
-
-	// Init LCD
-	printString(MODE_ "Wake up in ");
-	printUnsigned(MODE_ millis(MODE));
-	printString(MODE_ "ms");
-
-	gotoLineColumn(MODE_ 1, 0);
 }
 
 void loop (USER_MODE) {
-	busyWaitUntil(MODE_ counter * 1000);
-	counter++;
-
-	gotoLineColumn(MODE_ 1, 0);
-	printString(MODE_ "Date:");
-	printUnsigned(MODE_ millis(MODE));
+	if (gPerformCount) {
+		incrementations(MODE);
+		if (5000000 <= micros (MODE)) {
+			gPerformCount = false ;
+			gotoLineColumn (MODE_ 0, 0) ;
+			printUnsigned (MODE_ gCount1) ;
+			gotoLineColumn (MODE_ 1, 0) ;
+			printUnsigned (MODE_ gCount2) ;
+			gotoLineColumn (MODE_ 2, 0) ;
+			printUnsigned (MODE_ gCount3) ;
+			gotoLineColumn (MODE_ 3, 0) ;
+			printUnsigned (MODE_ gCount4) ;
+		}
+	}
 }

prog/sources/setup-loop.h

@@ -6,3 +6,9 @@ void setup (USER_MODE) asm ("setup.function") ;
 
 void loop (USER_MODE) asm ("loop.function") ;
 
+//$section fonction.incrementations
+
+void incrementations (USER_MODE) asm ("fonction.incrementations") ;
+
+void section_incrementations (SECTION_MODE) asm ("section.fonction.incrementations") ;
+

prog/sources/time.cpp

@@ -6,6 +6,26 @@ static void startSystick (BOOT_MODE) {
 	SYST_RVR = CPU_MHZ * 1000 - 1 ; // Underflow every ms
 	SYST_CVR = 0 ;
 	SYST_CSR = SYST_CSR_CLKSOURCE | SYST_CSR_ENABLE ;
+
+	// Configure and chain PIT0 and PIT1 for 64-bit counting
+
+	// Power on PIT
+	SIM_SCGC6 |= SIM_SCGC6_PIT ;
+
+	// Enable PIT module
+	PIT_MCR = 0 ;
+
+	// Disable PIT0 and PIT1
+	PIT_TCTRL (0) = 0 ;
+	PIT_TCTRL (1) = 0 ;
+
+	// PIT0 and PIT1 down-count: initialize them with all 1's
+	PIT_LDVAL (0) = UINT32_MAX ;
+	PIT_LDVAL (1) = UINT32_MAX ;
+
+	// Enable PIT0 and PIT1: start counting, chain PI1 to PIT0, no interrupt
+	PIT_TCTRL (1) = PIT_TCTRL_CHN | PIT_TCTRL_TEN ;
+	PIT_TCTRL (0) = PIT_TCTRL_TEN ;
 }
 
 MACRO_BOOT_ROUTINE (startSystick);
@@ -32,13 +52,39 @@ void busyWaitUntil (USER_MODE_ const uint32_t inDeadLineMS) {
 }
 
 void systickInterruptServiceRoutine (SECTION_MODE) {
-	gUptime += 1;
+	const uint32_t newUptime = gUptime + 1 ;
+	gUptime = newUptime ;
+
+	// Run every section routines in real.time.interrupt.routine.array
+	extern void (* __real_time_interrupt_routine_array_start) (SECTION_MODE_ const uint32_t inUptime) ;
+	extern void (* __real_time_interrupt_routine_array_end) (SECTION_MODE_ const uint32_t inUptime) ;
+	void (** ptr) (SECTION_MODE_ const uint32_t) = & __real_time_interrupt_routine_array_start ;
+	while (ptr != & __real_time_interrupt_routine_array_end) {
+		(* ptr) (MODE_ newUptime) ;
+		ptr ++ ;
+	}
 }
 
 uint32_t millis(ANY_MODE) {
 	return gUptime;
 }
 
+uint64_t section_micros(SECTION_MODE) {
+
+	// To obtain the correct value, first read LTMR64H and then LTMR64L
+	uint64_t result = PIT_LTMR64H ;
+	result <<= 32 ;
+	result |= PIT_LTMR64L ;
+
+	// PIT0 and PIT1 actually downcount
+	result = ~ result ;
+
+	// Divide by the clock frequency in MHz for getting microsecond count
+	result /= busMHZ () ;
+
+	return result;
+}
+
 uint32_t systick(ANY_MODE) {
 	return SYST_CVR;
 }

prog/sources/time.h

@@ -15,4 +15,17 @@ void systickInterruptServiceRoutine (SECTION_MODE) asm ("interrupt.section.SysTi
 
 uint32_t millis(ANY_MODE);
 
+//$section fonction.micros
+
+uint64_t micros (USER_MODE) asm ("fonction.micros") ;
+
+uint64_t section_micros (SECTION_MODE) asm ("section.fonction.micros") ;
+
+
 uint32_t systick(ANY_MODE);
+
+#define MACRO_REAL_TIME_ISR(ROUTINE) \
+	static void (* UNIQUE_IDENTIFIER) (SECTION_MODE_ const uint32_t inUptime) \
+__attribute__ ((section ("real.time.interrupt.routine.array"))) \
+__attribute__ ((unused)) \
+__attribute__ ((used)) = ROUTINE ;