Skip to content

Commit

Permalink
Revert to b83b024
Browse files Browse the repository at this point in the history
  • Loading branch information
@nks5295
nks5295 committed Dec 9, 2014
1 parent d1fb42d commit 3594293
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 402 deletions.
181 changes: 0 additions & 181 deletions src/components/implementation/no_interface/freertos/freertos_klib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,187 +178,6 @@ frt_vTaskSuspend(int xTaskToSuspend)
vTaskSuspend((xTaskHandle) frt_obj_array[xTaskToSuspend].obj);
}

void
frt_vTaskDelay(int xTicksToDelay)
{
assert(xTicksToDelay >= 0);

vTaskDelay((TickType) frt_obj_array[xTicksToDelay].obj);
}

// TODO: how do i do pionters here
/*
void
frt_vTaskDelayUntil(int *pxPrevoiusWakeTime, int xTimeIncrement)
{
}
*/

void
frt_vTaskResume(int xTaskToResume)
{
assert(frt_obj_array[xTaskToResume].type == FRT_OBJ_TASK);

vTaskResume((xTaskHandle) frt_obj_array[xTaskToResume].obj);
}

int
frt_xTaskResumeFromISR(int xTaskToResume)
{
assert(frt_obj_array[xTaskToResume].type == FRT_OBJ_TASK);

return (int) xTaskResumeFromISR((xTaskHandle) frt_obj_array[xTaskToResume].obj);
}

// TODO: Pointers issue here again
/*
unsigned int
uxTaskGetSystemState(...)
{
}
*/

int
frt_xTaskGetCurrentTaskHandle(void)
{
return (int) xTaskGetCurrentTaskHandle();
}

int
frt_xTaskGetIdleTaskHandle(void)
{
return (int) xTaskGetIdleTaskHandle();
}

unsigned int
frt_uxTaskGetStackHighWaterMark(int xTask)
{
if (xTask == NULL) return (unsigned int) uxTaskGetStackHighWaterMark((xTaskHandle) xTask);

assert(frt_obj_array[xTask].type == FRT_OBJ_TASK);
return (unsigned int) uxTaskGetStackHighWaterMark(frt_obj_array[xTask].obj);
}

// TODO: What to do with enumerated type?
/*
eTaskState
frt_eTaskGetState(int xTask)
{
assert(frt_obj_array[xTask].type == FRT_OBJ_TASK);
return (eTaskState) eTaskGetState(frt_obj_array[xTask].obj);
}
*/

// TODO: returns a char* pointer issue
/*
char*
frt_pcTaskGetName(int xTaskToQuery)
{
if (xTaskToQuery == NULL) return (char *) pcTaskGetName((xTaskHandle) xTaskToQuery);
assert(frt_obj_array[xTaskToQuery].type == FRT_OBJ_TASK);
return (char *) pcTaskGetName(frt_obj_array[xTaskToQuery].obj);
}
*/

int
frt_xTaskGetTickCount(void)
{
return (int) xTaskGetTickCount();
}

int
frt_xTaskGetTickCountFromISR(void)
{
return (int) xTaskGetTickCountFromISR();
}

int
frt_xTaskGetSchedulerState(void)
{
return (int) xTaskGetSchedulerState();
}

unsigned int
frt_uxTaskGetNumberOfTasks(void)
{
return (unsigned int) uxTaskGetNumberOfTasks();
}

// TODO: char * pointer
/*
void
frt_vTaskList(char *pcWriteBuffer)
{
}
*/

// TODO: char * pointer
/*
void
frt_vTaskStartTrace(char *pcBuffer, unsigned long ulBufferSize)
{
}
*/

unsigned long
frt_ulTaskEndTrace(void)
{
return (unsigned long) ulTaskEndTrace();
}

// TODO: How do I pointer?
/*
void
frt_vTaskGetRunTimeStats(char *pcWriteBuffer)
{
vTaskGetRunTimeStats(pcWriteBuffer);
}
*/

// TODO: More (function) pointers :(
// TaskHookFunction_t seems as if its a function pointer
/*
void
frt_vTaskSetApplicationTaskTag(int xTask, TaskHookFunction_t pxTagValue)
{
if (xTask == NULL) {
vTaskSetApplicationTaskTag( (xTaskHandle) xTask, pxTagValue);
return;
}
assert(frt_obj_array[xTask].type == FRT_OBJ_TASK);
vTaskSetApplicationTaskTag( (xTaskHandle) frt_obj_array[xTask].obj, pxTagValue);
// probably need to case the function pointer above to something
// but what?
}
*/

// TODO: Pointers :)
/*
frt_xTaskGetApplicationTaskTag(int xTask){
// the two return statements probably need casts
if (xTask == NULL) return xTaskGetApplicationTaskTag( (xTaskHandle) xTask);
assert(frt_obj_array[xTask].type == FRT_OBJ_TASK);
return xTaskGetApplicationTaskTag( (xTaskHandle) frt_obj_array[xTask].obj);
}
*/

// TODO: how to pointer?
// http://xkcd.com/138/
/*
int
frt_xTaskCallApplicationTaskHook(int xTask, void *pvParameter)
{
if (xTask == NULL) return (int) xTaskCallApplicationTaskHook( (xTaskHandle) xTask, pvParameter);
assert(frt_obj_array[xTask].type == FRT_OBJ_TASK);
return (int) xTaskCallApplicationTaskHook( (xTaskHandle) xTask, pvParameter);
}
*/

/*******
* FreeRTOS Queue API
*******/
Expand Down
146 changes: 0 additions & 146 deletions src/components/implementation/no_interface/freertos_app/freertos_lib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#define MAX_FRT_THDS 10

typedef int portBASE_TYPE;
typedef unsigned int UBaseType_t;
typedef long portTickType;
typedef void* xQueueHandle;
typedef xQueueHandle SemaphoreHandle_t;
Expand Down Expand Up @@ -78,151 +77,6 @@ vTaskSuspend(xTaskHandle xTaskToSuspend)
{
frt_vTaskSuspend((int)xTaskToSuspend);
}

void
vTaskDelay(portTickType xTicksToDelay)
{
frt_vTaskDelay((int)xTicksToDelay);
}

// TODO: Pointers
/*
void
vTaskDelayUntil(portTickType *pxPreviousWakeTime, portTickTime xTimeIncrement)
{
frt_vTaskDelayUntil((int *)pxPreviousWakeTime, (int)xTimeIncrement);
}
*/

void
vTaskResume(xTaskHandle xTaskToResume)
{
frt_vTaskDelay((int)xTaskToResume);
}

portBASE_TYPE
xTaskResumeFromISR(xTaskHandle xTaskToResume)
{
return frt_xTaskResumeFromISR((int)xTaskToResume);
}

xTaskHandle
xTaskGetCurrentTaskHandle(void)
{
return frt_xTaskGetCurrentTaskHandle();
}

xTaskHandle
xTaskGetIdleTaskHandle(void)
{
return frt_xTaskGetIdleTaskHandle();
}

UBaseType_t
uxTaskGetStackHighWaterMark(xTaskHandle xTask)
{
return frt_uxTaskGetStackHighWaterMark((int)xTask);
}

// TODO: Pointers
/*
eTaskState
eTaskGetState(xTaskHandle xTask)
{
return frt_eTaskGetState((int)xTask);
}
*/

// TODO: Can't do pointers, returns a char*
/*
char*
pcTaskGetName(xTaskHandle xTaskToQuery)
{
return frt_pcTaskGetName((int)xTaskToQuery);
}
*/

portTickType
xTaskGetTickCount(void)
{
return frt_xTaskGetTickCount();
}

portTickType
xTaskGetTickCountFromISR(void)
{
return frt_xTaskGetTickCountFromISR();
}

portBASE_TYPE
xTaskGetSchedulerState(void)
{
return frt_xTaskGetSchedulerState();
}

UBaseType_t
uxTaskGetNumberOfTasks(void)
{
return frt_uxTaskGetNumberOfTasks();
}

// TODO: char * pointer
/*
void
vTaskList(char *pcWriteBuffer)
{
}
*/

// TODO: char * pointer
/*
void
frt_vTaskStartTrace(char *pcBuffer, unsigned long ulBufferSize)
{
}
*/

unsigned long
ulTaskEndTrace(void)
{
return frt_ulTaskEndTrace();
}

// TODO: How to pointer?
/*
void
vTaskGetRunTimeStats(char *pcWriteBuffer)
{
frt_vTaskGetRunTimeStats(pcWriteBuffer);
}
*/

// TODO: TaskHookFunction_t seems like its a function pointer
/*
void
vTaskSetApplicationTaskTag(xTaskHandle xTask, TaskHookFunction_t pxTagValue)
{
frt_vTaskSetApplicationTaskTag(xTask, pxTagValue);
}
*/

// TODO: Still pointers
/*
xTaskGetApplicationTaskTag(xTaskHandle xTask)
{
frt_xTaskGetApplicationTaskTag(xTask);
}
*/

// TODO: Pointers...
/*
xTaskHandle
xTaskCallApplicationTaskHook(xTaskHandle xTask, void *pvParameter)
{
return frt_xTaskCallApplicationTaskHook(xTask, pvParameter);
}
*/

//Queues

int
Expand Down
39 changes: 9 additions & 30 deletions src/components/interface/frt/frt.h
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,13 @@
#ifndef FRT_H
#define FRT_H

int frt_vSemaphoreBinaryCreate(void);
int frt_xSemaphoreTake(int xSemaphore, int xTicksToWait);
int frt_xSemaphoreGive(int xSemaphore);
int frt_xTaskCreate(const char * const pcName, unsigned short usStackDepth, void *pvParameters, int uxPriority);
void frt_vTaskDelete(int xTask);
void frt_vTaskSuspend(int xTaskToSuspend);
void frt_vTaskDelay(int xTicksToDelay);
//void frt_vTaskDelayUntil(int *pxPreviousWakeTime, int xTimeIncrement);
int frt_vTaskResume(int xTaskToResume);
int frt_xTaskResumeFromISR(int xTaskToResume);
//void frt_uxTaskGetSystemState(...);
int frt_xTaskGetCurrentTaskHandle(void);
int frt_xTaskGetIdleTaskHandle(void);
unsigned int frt_uxTaskGetStackHighWaterMark(int xTask);
//eTaskState frt_eTaskGetState(int xTask);
//char* frt_pcTaskGetName(int xTaskToQuery);
//void frt_vTaskGetRunTimeStats(char *pcWriteBuffer);
//void frt_vTaskSetApplicationTaskTag(int xTask, TODO pxTagValue);
//TODO frt_xTaskGetApplicationTaskTag(int xTask);
//int frt_xTaskCallApplicationTaskHook(int xTask, void *pvParameter);
int frt_xTaskGetTickCount(void);
int frt_xTaskGetTickCountFromISR(void);
int frt_xTaskGetSchedulerState(void);
unsigned int frt_uxTaskGetNumberOfTasks(void);
//void frt_vTaskList(char *pcWriteBuffer);
//void frt_vTaskStartTrace(char *pcBuffer, unsigned long ulBufferSize);
unsigned long frt_ulTaskEndTrace(void);
int frt_xQueueCreate(int uxQueueLength, int uxItemSize, int ptr, spdid_t spd);
int frt_xQueueSend(int xQueue, int item, int xTicksToWait);
int frt_xQueueReceive(int xQueue, int buff, int xTicksToWait);
extern int frt_vSemaphoreBinaryCreate(void);
extern int frt_xSemaphoreTake(int xSemaphore, int xTicksToWait);
extern int frt_xSemaphoreGive(int xSemaphore);
extern int frt_xTaskCreate(const char * const pcName, unsigned short usStackDepth, void *pvParameters, int uxPriority);
extern void frt_vTaskDelete(int xTask);
extern void frt_vTaskSuspend(int xTaskToSuspend);
extern int frt_xQueueCreate(int uxQueueLength, int uxItemSize, int ptr, spdid_t spd);
extern int frt_xQueueSend(int xQueue, int item, int xTicksToWait);
extern int frt_xQueueReceive(int xQueue, int buff, int xTicksToWait);
#endif /* FRT_H */
Loading

0 comments on commit 3594293

Please sign in to comment.