Commit 836122f0 authored by Matthias Wenzl's avatar Matthias Wenzl
Browse files

update for current ti-rtos rev

parent 371108a6
This diff is collapsed.
......@@ -45,7 +45,6 @@
#include <clock-arch.h>
#include <server.h>
#include <client.h>
#include <blinkit.h>
#include <driverlib/emac.h>
/*access statically created symbols from cfg file*/
......
......@@ -59,3 +59,5 @@ TIRTOS.useUART = true;
Task.idleTaskStackSize = 512;
BIOS.heapSize = (1024*10*2);/*system heap - used for task stacks for example*/
TIRTOS.useI2C = true;
TIRTOS.useSPI = true;
/*
* Copyright (c) 2014, Texas Instruments Incorporated
* Copyright (c) 2015, Texas Instruments Incorporated
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
......@@ -34,7 +34,8 @@
*
* @brief EK_TM4C1294XL Board Specific APIs
*
* The EK_TM4C1294XL header file should be included in an application as follows:
* The EK_TM4C1294XL header file should be included in an application as
* follows:
* @code
* #include <EK_TM4C1294XL.h>
* @endcode
......@@ -74,16 +75,9 @@ extern "C" {
#define NUM_RX_DESCRIPTORS 5
/* LEDs on EK_TM4C1294XL are active high. */
#define EK_TM4C1294XL_LED_OFF ( 0)
#define EK_TM4C1294XL_LED_ON (~0)
/* GPIO_Callbacks structure for GPIO interrupts */
/* handled by <Board.h>
* extern const GPIO_Callbacks EK_TM4C1294XL_gpioPortJCallbacks;
*
*/
#define EK_TM4C1294XL_LED_OFF (0)
#define EK_TM4C1294XL_LED_ON (1)
/*!
* @def EK_TM4C1294XL_EMACName
......@@ -100,10 +94,10 @@ typedef enum EK_TM4C1294XL_EMACName {
* @brief Enum of LED names on the EK_TM4C1294XL dev board
*/
typedef enum EK_TM4C1294XL_GPIOName {
EK_TM4C1294XL_D1 = 0,
EK_TM4C1294XL_D2,
EK_TM4C1294XL_USR_SW1,
EK_TM4C1294XL_USR_SW2,
EK_TM4C1294XL_USR_SW1 = 0,
EK_TM4C1294XL_USR_SW2,
EK_TM4C1294XL_D1,
EK_TM4C1294XL_D2,
EK_TM4C1294XL_GPIOCOUNT
} EK_TM4C1294XL_GPIOName;
......@@ -113,13 +107,21 @@ typedef enum EK_TM4C1294XL_GPIOName {
* @brief Enum of I2C names on the EK_TM4C1294XL dev board
*/
typedef enum EK_TM4C1294XL_I2CName {
EK_TM4C1294XL_I2C0 = 0,
EK_TM4C1294XL_I2C2,
EK_TM4C1294XL_I2C7,
EK_TM4C1294XL_I2C7 = 0,
EK_TM4C1294XL_I2C8,
EK_TM4C1294XL_I2CCOUNT
} EEK_TM4C1294XL_I2CName;
} EK_TM4C1294XL_I2CName;
/*!
* @def EK_TM4C1294XL_PWMName
* @brief Enum of PWM names on the EK_TM4C1294XL dev board
*/
typedef enum EK_TM4C1294XL_PWMName {
EK_TM4C1294XL_PWM0 = 0,
EK_TM4C1294XL_PWMCOUNT
} EK_TM4C1294XL_PWMName;
/*!
* @def EK_TM4C1294XL_SDSPIName
......@@ -149,9 +151,6 @@ typedef enum EK_TM4C1294XL_SPIName {
*/
typedef enum EK_TM4C1294XL_UARTName {
EK_TM4C1294XL_UART0 = 0,
EK_TM4C1294XL_UART2,
EK_TM4C1294XL_UART6,
EK_TM4C1294XL_UART7,
EK_TM4C1294XL_UARTCOUNT
} EK_TM4C1294XL_UARTName;
......@@ -195,6 +194,15 @@ typedef enum EK_TM4C1294XL_WiFiName {
EK_TM4C1294XL_WIFICOUNT
} EK_TM4C1294XL_WiFiName;
/*!
* @brief Initialize the general board specific settings
*
* This function initializes the general board specific settings.
* This includes:
* - Enable clock sources for peripherals
*/
extern uint32_t EK_TM4C1294XL_initGeneral(uint32_t sysclock);
/*EMAC specific functions*/
/*initialize receive and transmit DMA descriptors*/
......@@ -250,16 +258,10 @@ void EK_TM4C1294XL_startEMAC(void);
uint8_t * EK_TM4C1294XL_getMACAddr(void);
void EK_TM4C1294XL_initDMA(void);
/*!
* @brief Initialize the general board specific settings
*
* This function initializes the general board specific settings. This include
* - Enable clock sources for peripherals
*/
extern uint32_t EK_TM4C1294XL_initGeneral(uint32_t sysclock);
/*
* Following function has been deprecated by
* *_Handle EK_TM4C1294XL_initEMAC(uint32_t sysclock, uint8_t *mac_addr)
* */
/*!
* @brief Initialize board specific EMAC settings
*
......@@ -277,7 +279,7 @@ extern uint32_t EK_TM4C1294XL_initGeneral(uint32_t sysclock);
* This function initializes the board specific GPIO settings and
* then calls the GPIO_init API to initialize the GPIO module.
*
* The GPIOs controlled by the GPIO module are determined by the GPIO_config
* The GPIOs controlled by the GPIO module are determined by the GPIO_PinConfig
* variable.
*/
extern void EK_TM4C1294XL_initGPIO(void);
......@@ -293,6 +295,17 @@ extern void EK_TM4C1294XL_initGPIO(void);
*/
extern void EK_TM4C1294XL_initI2C(void);
/*!
* @brief Initialize board specific PWM settings
*
* This function initializes the board specific PWM settings and then calls
* the PWM_init API to initialize the PWM module.
*
* The PWM peripherals controlled by the PWM module are determined by the
* PWM_config variable.
*/
extern void EK_TM4C1294XL_initPWM(void);
/*!
* @brief Initialize board specific SDSPI settings
*
......@@ -366,6 +379,9 @@ extern void EK_TM4C1294XL_initWatchdog(void);
*
* The hardware resources controlled by the WiFi module are determined by the
* WiFi_config variable.
*
* A SimpleLink CC3100 device or module is required and must be connected to
* use the WiFi driver.
*/
extern void EK_TM4C1294XL_initWiFi(void);
......
......@@ -7,7 +7,6 @@
#include <server.h>
#include "blinkit.h"
#if IS_SERVER
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment