First cut eCos port
inmarket
parent
124e0fcc19
commit
dc0f291350
|
|
@ -0,0 +1,112 @@
|
|||
/*
|
||||
* This file is subject to the terms of the GFX License. If a copy of
|
||||
* the license was not distributed with this file, you can obtain one at:
|
||||
*
|
||||
* http://ugfx.org/license.html
|
||||
*/
|
||||
|
||||
#include "gfx.h"
|
||||
|
||||
#if GFX_USE_OS_ECOS
|
||||
|
||||
void _gosInit(void)
|
||||
{
|
||||
/* Don't initialise if the user already has */
|
||||
//cyg_scheduler_start();
|
||||
}
|
||||
|
||||
void _gosDeinit(void)
|
||||
{
|
||||
/* ToDo */
|
||||
}
|
||||
|
||||
void gfxSleepMilliseconds(delaytime_t ms)
|
||||
{
|
||||
switch(ms) {
|
||||
case TIME_IMMEDIATE: cyg_thread_yield(); return;
|
||||
case TIME_INFINITE: cyg_thread_suspend(cyg_thread_self()); return;
|
||||
default: cyg_thread_delay(gfxMillisecondsToTicks(ms)); return;
|
||||
}
|
||||
}
|
||||
|
||||
void gfxSleepMicroseconds(delaytime_t ms)
|
||||
{
|
||||
switch(ms) {
|
||||
case TIME_IMMEDIATE: return;
|
||||
case TIME_INFINITE: cyg_thread_suspend(cyg_thread_self()); return;
|
||||
default: cyg_thread_delay(gfxMillisecondsToTicks(ms/1000)); return;
|
||||
}
|
||||
}
|
||||
|
||||
void gfxSemInit(gfxSem *psem, semcount_t val, semcount_t limit)
|
||||
{
|
||||
if (val > limit)
|
||||
val = limit;
|
||||
|
||||
psem->limit = limit;
|
||||
cyg_semaphore_init(&psem->sem, val);
|
||||
}
|
||||
|
||||
void gfxSemDestroy(gfxSem *psem)
|
||||
{
|
||||
cyg_semaphore_destroy(&psem->sem);
|
||||
}
|
||||
|
||||
bool_t gfxSemWait(gfxSem *psem, delaytime_t ms)
|
||||
{
|
||||
switch(ms) {
|
||||
case TIME_IMMEDIATE: return cyg_semaphore_trywait(&psem->sem);
|
||||
case TIME_INFINITE: return cyg_semaphore_wait(&psem->sem);
|
||||
default: return cyg_semaphore_timed_wait(&psem->sem, gfxMillisecondsToTicks(ms)+cyg_current_time());
|
||||
}
|
||||
}
|
||||
|
||||
bool_t gfxSemWaitI(gfxSem *psem)
|
||||
{
|
||||
return cyg_semaphore_trywait(&psem->sem);
|
||||
}
|
||||
|
||||
void gfxSemSignal(gfxSem *psem)
|
||||
{
|
||||
if (psem->limit == MAX_SEMAPHORE_COUNT)
|
||||
cyg_semaphore_post(&psem->sem);
|
||||
else {
|
||||
cyg_scheduler_lock();
|
||||
if (gfxSemCounterI(psem) < psem->limit)
|
||||
cyg_semaphore_post(&psem->sem);
|
||||
cyg_scheduler_unlock();
|
||||
}
|
||||
}
|
||||
|
||||
void gfxSemSignalI(gfxSem *psem)
|
||||
{
|
||||
if (psem->limit == MAX_SEMAPHORE_COUNT || gfxSemCounterI(psem) < psem->limit)
|
||||
cyg_semaphore_post(&psem->sem);
|
||||
}
|
||||
|
||||
semcount_t gfxSemCounterI(gfxSem *psem) {
|
||||
semcount_t cnt;
|
||||
|
||||
cyg_semaphore_peek(&psem->sem, &cnt);
|
||||
return cnt;
|
||||
}
|
||||
|
||||
gfxThreadHandle gfxThreadCreate(void *stackarea, size_t stacksz, threadpriority_t prio, DECLARE_THREAD_FUNCTION((*fn),p), void *param)
|
||||
{
|
||||
gfxThreadHandle th;
|
||||
|
||||
if (!stackarea) {
|
||||
if (!stacksz) stacksz = CYGNUM_HAL_STACK_SIZE_TYPICAL;
|
||||
if (!(stackarea = gfxAlloc(stacksz+sizeof(cyg_thread))))
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!stacksz)
|
||||
return 0;
|
||||
|
||||
cyg_thread_create(prio, fn, param, "uGFX", (((cyg_thread *)stackarea)+1), stacksz, &th, (cyg_thread *)stackarea);
|
||||
cyg_thread_resume(th);
|
||||
return th;
|
||||
}
|
||||
|
||||
#endif /* GFX_USE_OS_ECOS */
|
||||
|
|
@ -0,0 +1,106 @@
|
|||
/*
|
||||
* This file is subject to the terms of the GFX License. If a copy of
|
||||
* the license was not distributed with this file, you can obtain one at:
|
||||
*
|
||||
* http://ugfx.org/license.html
|
||||
*/
|
||||
|
||||
#ifndef _GOS_ECOS_H
|
||||
#define _GOS_ECOS_H
|
||||
|
||||
#if GFX_USE_OS_ECOS
|
||||
|
||||
#include <cyg/hal/hal_arch.h>
|
||||
#include <cyg/kernel/kapi.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
/*===========================================================================*/
|
||||
/* Type definitions */
|
||||
/*===========================================================================*/
|
||||
|
||||
typedef cyg_bool_t bool_t;
|
||||
typedef cyg_int8 int8_t;
|
||||
typedef cyg_uint8 uint8_t;
|
||||
typedef cyg_int16 int16_t;
|
||||
typedef cyg_uint16 uint16_t;
|
||||
typedef cyg_int32 int32_t;
|
||||
typedef cyg_uint32 uint32_t;
|
||||
typedef cyg_uint32 size_t;
|
||||
|
||||
#define TRUE -1
|
||||
#define FALSE 0
|
||||
#define TIME_IMMEDIATE 0
|
||||
#define TIME_INFINITE 0xFFFFFFFF
|
||||
|
||||
typedef cyg_ucount32 delaytime_t;
|
||||
typedef cyg_tick_count_t systemticks_t;
|
||||
typedef cyg_count32 semcount_t;
|
||||
typedef void threadreturn_t;
|
||||
typedef cyg_addrword_t threadpriority_t;
|
||||
typedef cyg_handle_t gfxThreadHandle;
|
||||
|
||||
#define MAX_SEMAPHORE_COUNT 0x7FFFFFFF
|
||||
#define LOW_PRIORITY (CYGNUM_KERNEL_SCHED_PRIORITIES-2)
|
||||
#define NORMAL_PRIORITY (CYGNUM_KERNEL_SCHED_PRIORITIES/2)
|
||||
#define HIGH_PRIORITY 0
|
||||
|
||||
#define DECLARE_THREAD_STACK(name, sz) struct { cyg_thread t; unsigned char stk[sz]; } name[1]
|
||||
#define DECLARE_THREAD_FUNCTION(fnName, param) threadreturn_t fnName(cyg_addrword_t param)
|
||||
|
||||
typedef struct {
|
||||
cyg_sem_t sem;
|
||||
semcount_t limit;
|
||||
} gfxSem;
|
||||
|
||||
typedef cyg_mutex_t gfxMutex;
|
||||
|
||||
|
||||
/*===========================================================================*/
|
||||
/* Function declarations. */
|
||||
/*===========================================================================*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define gfxSystemTicks() cyg_current_time()
|
||||
#define gfxExit() exit(0)
|
||||
#define gfxHalt(msg) exit(-1)
|
||||
#define gfxYield() cyg_thread_yield()
|
||||
|
||||
#define gfxMillisecondsToTicks(ms) (((ms)*(CYGNUM_HAL_RTC_DENOMINATOR*1000))/(CYGNUM_HAL_RTC_NUMERATOR/1000))
|
||||
void gfxSleepMilliseconds(delaytime_t ms);
|
||||
void gfxSleepMicroseconds(delaytime_t ms);
|
||||
|
||||
#define gfxAlloc(sz) malloc(sz)
|
||||
#define gfxFree(ptr) free(sz)
|
||||
#define gfxRealloc(ptr, oldsz, newsz) realloc(ptr, newsz)
|
||||
|
||||
#define gfxSystemLock() cyg_scheduler_lock()
|
||||
#define gfxSystemUnlock() cyg_scheduler_unlock()
|
||||
|
||||
#define gfxMutexInit(pmutex) cyg_mutex_init(pmutex)
|
||||
#define gfxMutexExit(pmutex) cyg_mutex_unlock(pmutex)
|
||||
#define gfxMutexDestroy(pmutex) cyg_mutex_destroy(pmutex)
|
||||
#define gfxMutexEnter(pmutex) cyg_mutex_lock(pmutex)
|
||||
|
||||
void gfxSemInit(gfxSem *psem, semcount_t val, semcount_t limit);
|
||||
void gfxSemDestroy(gfxSem *psem);
|
||||
bool_t gfxSemWait(gfxSem *psem, delaytime_t ms);
|
||||
bool_t gfxSemWaitI(gfxSem *psem);
|
||||
void gfxSemSignal(gfxSem *psem);
|
||||
void gfxSemSignalI(gfxSem *psem);
|
||||
semcount_t gfxSemCounterI(gfxSem *psem);
|
||||
#define gfxSemCounter(psem) gfxSemCounterI(psem)
|
||||
|
||||
gfxThreadHandle gfxThreadCreate(void *stackarea, size_t stacksz, threadpriority_t prio, DECLARE_THREAD_FUNCTION((*fn),p), void *param);
|
||||
#define gfxThreadWait(thread) NOTIMPLEMENTED_YET
|
||||
#define gfxThreadMe() cyg_thread_self()
|
||||
#define gfxThreadClose(thread) (void)thread
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* GFX_USE_OS_ECOS */
|
||||
#endif /* _GOS_ECOS_H */
|
||||
|
|
@ -451,6 +451,8 @@
|
|||
#include "src/gos/osx.h"
|
||||
#elif GFX_USE_OS_RAW32
|
||||
#include "src/gos/raw32.h"
|
||||
#elif GFX_USE_OS_ECOS
|
||||
#include "src/gos/ecos.h"
|
||||
#else
|
||||
#error "Your operating system is not supported yet"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -62,6 +62,13 @@
|
|||
#ifndef GFX_USE_OS_RAW32
|
||||
#define GFX_USE_OS_RAW32 FALSE
|
||||
#endif
|
||||
/**
|
||||
* @brief Use a eCos
|
||||
* @details Defaults to FALSE
|
||||
*/
|
||||
#ifndef GFX_USE_OS_ECOS
|
||||
#define GFX_USE_OS_ECOS FALSE
|
||||
#endif
|
||||
/**
|
||||
* @}
|
||||
*
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#ifndef _GOS_RULES_H
|
||||
#define _GOS_RULES_H
|
||||
|
||||
#if !GFX_USE_OS_CHIBIOS && !GFX_USE_OS_WIN32 && !GFX_USE_OS_LINUX && !GFX_USE_OS_OSX && !GFX_USE_OS_RAW32 && !GFX_USE_OS_FREERTOS
|
||||
#if !GFX_USE_OS_CHIBIOS && !GFX_USE_OS_WIN32 && !GFX_USE_OS_LINUX && !GFX_USE_OS_OSX && !GFX_USE_OS_RAW32 && !GFX_USE_OS_FREERTOS && !GFX_USE_OS_ECOS
|
||||
#if GFX_DISPLAY_RULE_WARNINGS
|
||||
#warning "GOS: No Operating System has been defined. ChibiOS (GFX_USE_OS_CHIBIOS) has been turned on for you."
|
||||
#endif
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
#define GFX_USE_OS_CHIBIOS TRUE
|
||||
#endif
|
||||
|
||||
#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 + GFX_USE_OS_FREERTOS != 1 * TRUE
|
||||
#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 + GFX_USE_OS_FREERTOS + GFX_USE_OS_ECOS != 1 * TRUE
|
||||
#error "GOS: More than one operation system has been defined as TRUE."
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue