Skip to content

Commit 81a0392

Browse files
committed
8.0.1
updated qp_config.h files
1 parent 3502539 commit 81a0392

File tree

114 files changed

+4217
-2229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+4217
-2229
lines changed

arm-cm/blinky_ek-tm4c123gxl/qp_config.h

Lines changed: 66 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//============================================================================
2-
// QP configuration file (generic)
2+
// QP configuration file (QV/QK/QXK on ARM Cortex-M TM4C)
33
//
44
// Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
55
//
@@ -59,19 +59,19 @@
5959
// <i> * Hard-limits for all loops
6060
// <i> * Memory Isolation by means of Memory Protection Unit (MPU)
6161

62-
// <c3>Disable QP FuSa in development
62+
// <c3>Disable QP FuSa in development (NOT recommended)
6363
// <i>Disable assertions and other self monitoring features
6464
// <i>in development build configurations (NDEBUG undefined).
65-
// <i>VIOLATES functional safety standards. NOT recommended !!!
65+
// <i>NOTE: Disabling safety *violates* functional safety standards.
6666
//#ifndef NDEBUG
6767
//#define Q_UNSAFE
6868
//#endif
6969
// </c>
7070

71-
// <c3>Disable QP FuSa in production release
72-
// <i>Disable assertions and other self monitoring features
71+
// <c3>Disable QP FuSa in production release (NOT recommended)
72+
// <i>Disable assertions and other safety features
7373
// <i>in the release build configurations (NDEBUG defined).
74-
// <i>VIOLATES functional safety standards. NOT recommended !!!
74+
// <i>NOTE: Disabling safety *violates* functional safety standards.
7575
//#ifdef NDEBUG
7676
//#define Q_UNSAFE
7777
//#endif
@@ -80,7 +80,7 @@
8080
// </h>
8181

8282
//..........................................................................
83-
// <h>QEP Event Processor
83+
// <h>QEP Event Processor (Events)
8484
// <i>Events and state machines.
8585

8686
// <o>Event signal size (Q_SIGNAL_SIZE)
@@ -94,7 +94,7 @@
9494
// </h>
9595

9696
//..........................................................................
97-
// <h>QF Framework
97+
// <h>QF Framework (Active Objects)
9898
// <i>Active Object framework
9999

100100
// <o>Maximum # Active Objects (QF_MAX_ACTIVE) <1-64>
@@ -120,16 +120,6 @@
120120
// <i>Default: 1
121121
#define QF_MAX_TICK_RATE 1U
122122

123-
// <c1>Event parameter initialization (QEVT_PAR_INIT)
124-
// <i>Resource Acquisition Is Initialization (RAII) for dynamic events
125-
//#define QEVT_PAR_INIT
126-
// </c>
127-
128-
// <c1>Active Object stop API (QACTIVE_CAN_STOP)
129-
// <i>Enable Active Object stop API (Not recommended)
130-
//#define QACTIVE_CAN_STOP
131-
// </c>
132-
133123
// <o>Event size (QF_EVENT_SIZ_SIZE)
134124
// <1U=>1
135125
// <2U=>2 (default)
@@ -169,15 +159,69 @@
169159
// <i>Default: 2 (64K bytes maximum block size)
170160
#define QF_MPOOL_SIZ_SIZE 2U
171161

162+
// <c2>Enable event parameter initialization (QEVT_PAR_INIT)
163+
// <i>Initialize parameters of dynamic events at allocation
164+
// <i>(Resource Acquisition Is Initialization (RAII) for dynamic events)
165+
//#define QEVT_PAR_INIT
166+
// </c>
167+
168+
// <c1>Enable active object stop API (QACTIVE_CAN_STOP)
169+
// <i>NOTE: Not recommended
170+
//#define QACTIVE_CAN_STOP
171+
// </c>
172+
173+
// <c1>Enable context switch callback *without* QS (QF_ON_CONTEXT_SW)
174+
// <i>Context switch callback QF_onContextSw() when Q_SPY is undefined.
175+
//#ifndef Q_SPY
176+
//#define QF_ON_CONTEXT_SW
177+
//#endif
178+
// </c>
179+
180+
// <c1>Enable context switch callback *with* QS (QF_ON_CONTEXT_SW)
181+
// <i>Context switch callback QF_onContextSw() when Q_SPY is defined.
182+
//#ifdef Q_SPY
183+
//#define QF_ON_CONTEXT_SW
184+
//#endif
185+
// </c>
186+
187+
// <c2>Enable memory isolation (QF_MEM_ISOLATE)
188+
// <i>Memory isolation (requires MPU)
189+
// <i>NOTE: implies QF_ON_CONTEXT_SW.
190+
//#define QF_MEM_ISOLATE
191+
// </c>
192+
193+
// </h>
194+
195+
//..........................................................................
196+
// <h>QV/QK/QXK built-in kernels (ARM Cortex-M)
197+
198+
// <c2>Kernel uses critical section based on BASEPRI (QF_USE_BASEPRI)
199+
// <i>If not selected, critical section will be based on PRIMASK
200+
// <i>NOTE: The BASEPRI threshold can be adjusted in the "Text Editor" mode.
201+
#define QF_USE_BASEPRI 0x3F
202+
// </c>
203+
204+
// <c2>QK Kernel uses IRQ for return-from-preemption
205+
// <i>NOTE: Use "editor mode" to edit QK_USE_IRQ_NUM
206+
// <i>NOTE: Use "editor mode" to edit QK_USE_IRQ_HANDLER
207+
//#define QK_USE_IRQ_NUM 38
208+
//#define QK_USE_IRQ_HANDLER QEI1_IRQHandler
209+
// </c>
210+
211+
// <c2>QXK Kernel uses IRQ for return-from-preemption
212+
// <i>NOTE: Use "editor mode" to edit QXK_USE_IRQ_NUM
213+
// <i>NOTE: Use "editor mode" to edit QXK_USE_IRQ_HANDLER
214+
//#define QXK_USE_IRQ_NUM 38
215+
//#define QXK_USE_IRQ_HANDLER QEI1_IRQHandler
216+
// </c>
217+
172218
// </h>
173219

174220
//..........................................................................
175-
// <h>QS Software Tracing
221+
// <h>QS Software Tracing (Q_SPY)
176222
// <i>Target-resident component of QP/Spy software tracing system
177223
// <i>(tracing instrumentation and command-input).
178-
179-
// <n>NOTE: Requires command-line macro: Q_SPY
180-
// <i>The QS software tracing instrumentation is activated only when
224+
// <i>NOTE: The QS software tracing instrumentation is activated only when
181225
// <i>the macro Q_SPY is defined on the command-line to the compiler.
182226
// <i>Typically, Q_SPY is defined only in the "spy" build configuration.
183227

arm-cm/blinky_ek-tm4c123gxl/qv/armclang/blinky-qv.uvoptx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@
117117
<pMon>BIN\lmidk-agdi.dll</pMon>
118118
</DebugOpt>
119119
<TargetDriverDllRegistry>
120-
<SetRegEntry>
121-
<Number>0</Number>
122-
<Key>DLGUARM</Key>
123-
</SetRegEntry>
124120
<SetRegEntry>
125121
<Number>0</Number>
126122
<Key>ARMRTXEVENTFLAGS</Key>

arm-cm/blinky_ek-tm4c123gxl/qv/armclang/blinky-qv.uvprojx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@
631631
<TargetName>blinky-rel</TargetName>
632632
<ToolsetNumber>0x4</ToolsetNumber>
633633
<ToolsetName>ARM-ADS</ToolsetName>
634-
<pCCUsed>6130001::V6.13.1::.\ARMCLANG</pCCUsed>
634+
<pCCUsed>6220000::V6.22::ARMCLANG</pCCUsed>
635635
<uAC6>1</uAC6>
636636
<TargetOption>
637637
<TargetCommonOption>
@@ -935,7 +935,7 @@
935935
</ArmAdsMisc>
936936
<Cads>
937937
<interw>0</interw>
938-
<Optim>7</Optim>
938+
<Optim>5</Optim>
939939
<oTime>0</oTime>
940940
<SplitLS>0</SplitLS>
941941
<OneElfS>1</OneElfS>
@@ -992,7 +992,7 @@
992992
<TextAddressRange>0x00000000</TextAddressRange>
993993
<DataAddressRange>0x20000000</DataAddressRange>
994994
<pXoBase></pXoBase>
995-
<ScatterFile>,\blinky-qv.sct</ScatterFile>
995+
<ScatterFile>.\blinky-qv.sct</ScatterFile>
996996
<IncludeLibs></IncludeLibs>
997997
<IncludeLibsPath></IncludeLibsPath>
998998
<Misc>--entry Reset_Handler</Misc>
@@ -1252,7 +1252,7 @@
12521252
<TargetName>blinky-spy</TargetName>
12531253
<ToolsetNumber>0x4</ToolsetNumber>
12541254
<ToolsetName>ARM-ADS</ToolsetName>
1255-
<pCCUsed>6160000::V6.16::ARMCLANG</pCCUsed>
1255+
<pCCUsed>6220000::V6.22::ARMCLANG</pCCUsed>
12561256
<uAC6>1</uAC6>
12571257
<TargetOption>
12581258
<TargetCommonOption>

arm-cm/blinky_nucleo-c031c6/qp_config.h

Lines changed: 66 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//============================================================================
2-
// QP configuration file (generic)
2+
// QP configuration file (QV/QK/QXK on ARM Cortex-M)
33
//
44
// Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
55
//
@@ -59,19 +59,19 @@
5959
// <i> * Hard-limits for all loops
6060
// <i> * Memory Isolation by means of Memory Protection Unit (MPU)
6161

62-
// <c3>Disable QP FuSa in development
62+
// <c3>Disable QP FuSa in development (NOT recommended)
6363
// <i>Disable assertions and other self monitoring features
6464
// <i>in development build configurations (NDEBUG undefined).
65-
// <i>VIOLATES functional safety standards. NOT recommended !!!
65+
// <i>NOTE: Disabling safety *violates* functional safety standards.
6666
//#ifndef NDEBUG
6767
//#define Q_UNSAFE
6868
//#endif
6969
// </c>
7070

71-
// <c3>Disable QP FuSa in production release
72-
// <i>Disable assertions and other self monitoring features
71+
// <c3>Disable QP FuSa in production release (NOT recommended)
72+
// <i>Disable assertions and other safety features
7373
// <i>in the release build configurations (NDEBUG defined).
74-
// <i>VIOLATES functional safety standards. NOT recommended !!!
74+
// <i>NOTE: Disabling safety *violates* functional safety standards.
7575
//#ifdef NDEBUG
7676
//#define Q_UNSAFE
7777
//#endif
@@ -80,7 +80,7 @@
8080
// </h>
8181

8282
//..........................................................................
83-
// <h>QEP Event Processor
83+
// <h>QEP Event Processor (Events)
8484
// <i>Events and state machines.
8585

8686
// <o>Event signal size (Q_SIGNAL_SIZE)
@@ -94,7 +94,7 @@
9494
// </h>
9595

9696
//..........................................................................
97-
// <h>QF Framework
97+
// <h>QF Framework (Active Objects)
9898
// <i>Active Object framework
9999

100100
// <o>Maximum # Active Objects (QF_MAX_ACTIVE) <1-64>
@@ -120,16 +120,6 @@
120120
// <i>Default: 1
121121
#define QF_MAX_TICK_RATE 1U
122122

123-
// <c1>Event parameter initialization (QEVT_PAR_INIT)
124-
// <i>Resource Acquisition Is Initialization (RAII) for dynamic events
125-
//#define QEVT_PAR_INIT
126-
// </c>
127-
128-
// <c1>Active Object stop API (QACTIVE_CAN_STOP)
129-
// <i>Enable Active Object stop API (Not recommended)
130-
//#define QACTIVE_CAN_STOP
131-
// </c>
132-
133123
// <o>Event size (QF_EVENT_SIZ_SIZE)
134124
// <1U=>1
135125
// <2U=>2 (default)
@@ -169,15 +159,69 @@
169159
// <i>Default: 2 (64K bytes maximum block size)
170160
#define QF_MPOOL_SIZ_SIZE 2U
171161

162+
// <c2>Enable event parameter initialization (QEVT_PAR_INIT)
163+
// <i>Initialize parameters of dynamic events at allocation
164+
// <i>(Resource Acquisition Is Initialization (RAII) for dynamic events)
165+
//#define QEVT_PAR_INIT
166+
// </c>
167+
168+
// <c1>Enable active object stop API (QACTIVE_CAN_STOP)
169+
// <i>NOTE: Not recommended
170+
//#define QACTIVE_CAN_STOP
171+
// </c>
172+
173+
// <c1>Enable context switch callback *without* QS (QF_ON_CONTEXT_SW)
174+
// <i>Context switch callback QF_onContextSw() when Q_SPY is undefined.
175+
//#ifndef Q_SPY
176+
//#define QF_ON_CONTEXT_SW
177+
//#endif
178+
// </c>
179+
180+
// <c1>Enable context switch callback *with* QS (QF_ON_CONTEXT_SW)
181+
// <i>Context switch callback QF_onContextSw() when Q_SPY is defined.
182+
//#ifdef Q_SPY
183+
//#define QF_ON_CONTEXT_SW
184+
//#endif
185+
// </c>
186+
187+
// <c2>Enable memory isolation (QF_MEM_ISOLATE)
188+
// <i>Memory isolation (requires MPU)
189+
// <i>NOTE: implies QF_ON_CONTEXT_SW.
190+
//#define QF_MEM_ISOLATE
191+
// </c>
192+
193+
// </h>
194+
195+
//..........................................................................
196+
// <h>QV/QK/QXK built-in kernels (ARM Cortex-M)
197+
198+
// <c2>Kernel uses critical section based on BASEPRI (QF_USE_BASEPRI)
199+
// <i>If not selected, critical section will be based on PRIMASK
200+
// <i>NOTE: The BASEPRI threshold can be adjusted in the "Text Editor" mode.
201+
//#define QF_USE_BASEPRI 0x3F
202+
// </c>
203+
204+
// <c2>QK Kernel uses IRQ for return-from-preemption
205+
// <i>NOTE: Use "editor mode" to edit QK_USE_IRQ_NUM
206+
// <i>NOTE: Use "editor mode" to edit QK_USE_IRQ_HANDLER
207+
//#define QK_USE_IRQ_NUM NNN
208+
//#define QK_USE_IRQ_HANDLER XXX_IRQHandler
209+
// </c>
210+
211+
// <c2>QXK Kernel uses IRQ for return-from-preemption
212+
// <i>NOTE: Use "editor mode" to edit QXK_USE_IRQ_NUM
213+
// <i>NOTE: Use "editor mode" to edit QXK_USE_IRQ_HANDLER
214+
//#define QXK_USE_IRQ_NUM NNN
215+
//#define QXK_USE_IRQ_HANDLER XXX_IRQHandler
216+
// </c>
217+
172218
// </h>
173219

174220
//..........................................................................
175-
// <h>QS Software Tracing
221+
// <h>QS Software Tracing (Q_SPY)
176222
// <i>Target-resident component of QP/Spy software tracing system
177223
// <i>(tracing instrumentation and command-input).
178-
179-
// <n>NOTE: Requires command-line macro: Q_SPY
180-
// <i>The QS software tracing instrumentation is activated only when
224+
// <i>NOTE: The QS software tracing instrumentation is activated only when
181225
// <i>the macro Q_SPY is defined on the command-line to the compiler.
182226
// <i>Typically, Q_SPY is defined only in the "spy" build configuration.
183227

0 commit comments

Comments
 (0)