git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@117 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
b74cb5bc1a
commit
6f0569444d
|
@ -24,7 +24,6 @@
|
|||
//#include "lpc214x_serial.h"
|
||||
//#include "lpc214x_ssp.h"
|
||||
//#include "mmcsd.h"
|
||||
|
||||
//#include "buzzer.h"
|
||||
|
||||
extern void IrqHandler(void);
|
||||
|
@ -165,6 +164,12 @@ void chSysHalt(void) {
|
|||
;
|
||||
}
|
||||
|
||||
/*
|
||||
* System console message (not implemented).
|
||||
*/
|
||||
void chSysPuts(char *msg) {
|
||||
}
|
||||
|
||||
/*
|
||||
* Non-vectored IRQs handling here.
|
||||
*/
|
||||
|
|
|
@ -97,7 +97,8 @@ extern void chSysUnlock(void);
|
|||
#define UserStackSize(n) StackAlign(sizeof(Thread) + \
|
||||
sizeof(struct intctx) + \
|
||||
sizeof(struct extctx) + \
|
||||
(n) + (INT_REQUIRED_STACK))
|
||||
(n) + \
|
||||
INT_REQUIRED_STACK)
|
||||
#define WorkingArea(s, n) ULONG32 s[UserStackSize(n) >> 2];
|
||||
|
||||
/* It requires zero bytes, but better be safe.*/
|
||||
|
|
|
@ -97,7 +97,8 @@ extern void chSysUnlock(void);
|
|||
#define UserStackSize(n) StackAlign(sizeof(Thread) + \
|
||||
sizeof(struct intctx) + \
|
||||
sizeof(struct extctx) + \
|
||||
(n) + (INT_REQUIRED_STACK))
|
||||
(n) + \
|
||||
INT_REQUIRED_STACK)
|
||||
#define WorkingArea(s, n) ULONG32 s[UserStackSize(n) >> 2];
|
||||
|
||||
/* It requires zero bytes, but better be safe.*/
|
||||
|
|
|
@ -68,7 +68,7 @@ void ChkIntSources(void) {
|
|||
}
|
||||
}
|
||||
|
||||
t_msg _IdleThread(void) {
|
||||
t_msg _IdleThread(void *p) {
|
||||
|
||||
chThdSetPriority(IDLEPRIO);
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ typedef void *regx86;
|
|||
/*
|
||||
* Stack saved context.
|
||||
*/
|
||||
struct stackregs {
|
||||
struct intctx {
|
||||
regx86 ebx;
|
||||
regx86 edi;
|
||||
regx86 esi;
|
||||
|
@ -38,7 +38,7 @@ struct stackregs {
|
|||
};
|
||||
|
||||
typedef struct {
|
||||
struct stackregs *esp;
|
||||
struct intctx *esp;
|
||||
} Context;
|
||||
|
||||
#define APUSH(p, a) (p) -= sizeof(void *), *(void **)(p) = (void*)(a)
|
||||
|
@ -48,23 +48,26 @@ typedef struct {
|
|||
BYTE8 *esp = (BYTE8 *)workspace + wsize; \
|
||||
APUSH(esp, arg); \
|
||||
APUSH(esp, threadexit); \
|
||||
esp -= sizeof(struct stackregs); \
|
||||
((struct stackregs *)esp)->eip = pf; \
|
||||
((struct stackregs *)esp)->ebx = 0; \
|
||||
((struct stackregs *)esp)->edi = 0; \
|
||||
((struct stackregs *)esp)->esi = 0; \
|
||||
((struct stackregs *)esp)->ebp = 0; \
|
||||
tp->p_ctx.esp = (struct stackregs *)esp; \
|
||||
esp -= sizeof(struct intctx); \
|
||||
((struct intctx *)esp)->eip = pf; \
|
||||
((struct intctx *)esp)->ebx = 0; \
|
||||
((struct intctx *)esp)->edi = 0; \
|
||||
((struct intctx *)esp)->esi = 0; \
|
||||
((struct intctx *)esp)->ebp = 0; \
|
||||
tp->p_ctx.esp = (struct intctx *)esp; \
|
||||
}
|
||||
|
||||
#define chSysLock()
|
||||
#define chSysUnlock()
|
||||
#define chSysPuts(msg) {}
|
||||
|
||||
#define INT_REQUIRED_STACK 0x0
|
||||
#define UserStackSize(n) (sizeof(Thread) + sizeof(void *)*2 + \
|
||||
sizeof(struct stackregs) + (n) + (INT_REQUIRED_STACK))
|
||||
|
||||
#define INT_REQUIRED_STACK 0
|
||||
#define StackAlign(n) ((((n) - 1) | 3) + 1)
|
||||
#define UserStackSize(n) StackAlign(sizeof(Thread) + \
|
||||
sizeof(void *) * 2 + \
|
||||
sizeof(struct intctx) + \
|
||||
(n) + \
|
||||
INT_REQUIRED_STACK)
|
||||
#define WorkingArea(s, n) ULONG32 s[UserStackSize(n) >> 2];
|
||||
|
||||
#define IDLE_THREAD_STACK_SIZE 16384
|
||||
|
|
|
@ -29,7 +29,7 @@ typedef void *regx86;
|
|||
/*
|
||||
* Stack saved context.
|
||||
*/
|
||||
struct stackregs {
|
||||
struct intctx {
|
||||
regx86 ebx;
|
||||
regx86 edi;
|
||||
regx86 esi;
|
||||
|
@ -38,7 +38,7 @@ struct stackregs {
|
|||
};
|
||||
|
||||
typedef struct {
|
||||
struct stackregs *esp;
|
||||
struct intctx *esp;
|
||||
} Context;
|
||||
|
||||
#define APUSH(p, a) (p) -= sizeof(void *), *(void **)(p) = (void*)(a)
|
||||
|
@ -48,23 +48,26 @@ typedef struct {
|
|||
BYTE8 *esp = (BYTE8 *)workspace + wsize; \
|
||||
APUSH(esp, arg); \
|
||||
APUSH(esp, threadstart); \
|
||||
esp -= sizeof(struct stackregs); \
|
||||
((struct stackregs *)esp)->eip = pf; \
|
||||
((struct stackregs *)esp)->ebx = 0; \
|
||||
((struct stackregs *)esp)->edi = 0; \
|
||||
((struct stackregs *)esp)->esi = 0; \
|
||||
((struct stackregs *)esp)->ebp = 0; \
|
||||
tp->p_ctx.esp = (struct stackregs *)esp; \
|
||||
esp -= sizeof(struct intctx); \
|
||||
((struct intctx *)esp)->eip = pf; \
|
||||
((struct intctx *)esp)->ebx = 0; \
|
||||
((struct intctx *)esp)->edi = 0; \
|
||||
((struct intctx *)esp)->esi = 0; \
|
||||
((struct intctx *)esp)->ebp = 0; \
|
||||
tp->p_ctx.esp = (struct intctx *)esp; \
|
||||
}
|
||||
|
||||
#define chSysLock()
|
||||
#define chSysUnlock()
|
||||
#define chSysPuts(msg) {}
|
||||
|
||||
#define INT_REQUIRED_STACK 0x0
|
||||
#define UserStackSize(n) (sizeof(Thread) + sizeof(void *) * 2 + \
|
||||
sizeof(struct stackregs) + (n) + (INT_REQUIRED_STACK))
|
||||
|
||||
#define INT_REQUIRED_STACK 0
|
||||
#define StackAlign(n) ((((n) - 1) | 3) + 1)
|
||||
#define UserStackSize(n) StackAlign(sizeof(Thread) + \
|
||||
sizeof(void *) * 2 + \
|
||||
sizeof(struct intctx) + \
|
||||
(n) + \
|
||||
INT_REQUIRED_STACK)
|
||||
#define WorkingArea(s, n) ULONG32 s[UserStackSize(n) >> 2];
|
||||
|
||||
#define IDLE_THREAD_STACK_SIZE 16384
|
||||
|
|
|
@ -244,7 +244,8 @@ PREDEFINED = __JUST_STUBS__ \
|
|||
CH_USE_MESSAGES_TIMEOUT \
|
||||
CH_USE_MESSAGES_EVENT \
|
||||
CH_USE_SEMSW \
|
||||
CH_USE_DEBUG
|
||||
CH_USE_DEBUG \
|
||||
CH_USE_TRACE
|
||||
EXPAND_AS_DEFINED =
|
||||
SKIP_FUNCTION_MACROS = YES
|
||||
#---------------------------------------------------------------------------
|
||||
|
|
|
@ -13,7 +13,7 @@ Homepage</h2>
|
|||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: center; vertical-align: top; width: 150px;">Current
|
||||
Version 0.4.2<br>
|
||||
Version 0.4.3<br>
|
||||
-<br>
|
||||
<a href="http://sourceforge.net/projects/chibios/" rel="me" target="_top">Project on SourceForge</a><br>
|
||||
<a href="html/index.html" target="_top" rel="me">Documentation</a><br>
|
||||
|
|
|
@ -40,13 +40,15 @@ AVR-AT90CANx-GCC - Port on AVR AT90CAN128, not complete yet.
|
|||
*****************************************************************************
|
||||
|
||||
*** 0.4.3 ***
|
||||
- Minor improvement in the LPC214x serial driver, unneeded events were
|
||||
generated.
|
||||
- Size optimization in the events code, now the chEvtWait() reuses the
|
||||
chEvtWaitTimeout() code if it is enabled.
|
||||
- Size optimization in the semaphores code, now the chSemWaitTimeout() just
|
||||
invokes the chSemWaitTimeoutS() inside its system mutex zone.
|
||||
- Minor improvement in the LPC214x serial driver, unneeded events were
|
||||
generated in some rare cases.
|
||||
- Fixed a chSysInit() documentation error.
|
||||
- Added a new debug switch: CH_USE_TRACE, previously the trace functionality
|
||||
was associated to the CH_USE_DEBUG switch.
|
||||
|
||||
*** 0.4.2 ***
|
||||
- Added a minimal ARM7-LPC demo, you can use this one as template in order to
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#ifdef CH_USE_DEBUG
|
||||
|
||||
char *dbglastmsg;
|
||||
char *panicmsg;
|
||||
|
||||
/**
|
||||
* Debug subsystem initialization.
|
||||
|
@ -34,23 +34,14 @@ void chDbgInit(void) {
|
|||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
* Prints a message on the console/debugger. The latest message pointer
|
||||
* is retained.
|
||||
*/
|
||||
void chDbgPuts(char *msg) {
|
||||
|
||||
dbglastmsg = msg;
|
||||
chSysPuts(msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* Prints a panic message on the console/debugger and then halts the system.
|
||||
*/
|
||||
void chDbgPanic(char *msg) {
|
||||
|
||||
panicmsg = msg;
|
||||
chSysPuts("PANIC: ");
|
||||
chDbgPuts(msg);
|
||||
chSysPuts(msg);
|
||||
chSysHalt();
|
||||
}
|
||||
|
||||
|
|
|
@ -61,7 +61,6 @@ extern "C" {
|
|||
#else /* CH_USE_DEBUG */
|
||||
|
||||
#define chDbgInit()
|
||||
#define chDbgPuts(msg) {}
|
||||
#define chDbgPanic(msg) {}
|
||||
|
||||
#endif /* CH_USE_DEBUG */
|
||||
|
|
Loading…
Reference in New Issue