deon/chopstx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys.h changes

Browse Source
This commit is contained in:
NIIBE Yutaka
2013-06-06 12:08:35 +09:00
parent 60e0fbd189
commit c838e3f0e9
13 changed files with 81 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,6 +1,8 @@
2013-06-06 Niibe Yutaka <gniibe@fsij.org>
* chopstx.c (PREEMPTION_USEC): Fix.
* entry.c: Include sys.h for clock_init and gpio_init.
* chopstx.c (PREEMPTION_USEC): Fix the value.
2013-06-05 Niibe Yutaka <gniibe@fsij.org>

2
board/board-fst-01-00.h
View File

@@ -1,3 +1,5 @@
#define FLASH_PAGE_SIZE 1024
#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV1
#define STM32_PLLMUL_VALUE 9
#define STM32_HSECLK 8000000

2
board/board-fst-01.h
View File

@@ -1,3 +1,5 @@
#define FLASH_PAGE_SIZE 1024
#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV1
#define STM32_PLLMUL_VALUE 6
#define STM32_HSECLK 12000000

2
board/board-olimex-stm32-h103.h
View File

@@ -1,3 +1,5 @@
#define FLASH_PAGE_SIZE 1024
#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV1
#define STM32_PLLMUL_VALUE 9
#define STM32_HSECLK 8000000

2
board/board-stm8s-discovery.h
View File

@@ -1,3 +1,5 @@
#define FLASH_PAGE_SIZE 1024
#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV1
#define STM32_PLLMUL_VALUE 9
#define STM32_HSECLK 8000000

8
chopstx.c
View File

@@ -41,6 +41,11 @@
#define CHX_FLAGS_MAIN 0
#endif
/* Constant for round robin scheduling. */
#if !defined(PREEMPTION_USEC)
#define PREEMPTION_USEC 1000 /* 1ms */
#endif
#define MAX_PRIO 255
/*
@@ -88,9 +93,6 @@ chx_fatal (uint32_t err_code)
/* RUNNING: the current thread. */
struct chx_thread *running;
/* For round robin scheduling. */
#define PREEMPTION_USEC 1000 /* 1ms */
/* Double linked list operations. */
struct chx_dll {
struct chx_thread *next, *prev;

23
entry.c
View File

@@ -29,20 +29,9 @@
#include <stdint.h>
#include <stdlib.h>
#if 0
#ifdef HAVE_SYS_H
#define INLINE __attribute__ ((used))
#include "sys.h"
static void __attribute__ ((used))
clock_init (void)
{
(*vector[16]) ();
}
static void __attribute__ ((used))
gpio_init (void)
{
(*vector[17]) ();
}
#else
#include "board.h"
@@ -101,7 +90,7 @@ struct RCC {
};
#define RCC_BASE (AHBPERIPH_BASE + 0x1000)
#define RCC ((struct RCC *)RCC_BASE)
static struct RCC *const RCC = ((struct RCC *const)RCC_BASE);
#define RCC_APB1ENR_USBEN 0x00800000
#define RCC_APB1RSTR_USBRST 0x00800000
@@ -132,7 +121,7 @@ struct FLASH {
};
#define FLASH_R_BASE (AHBPERIPH_BASE + 0x2000)
#define FLASH ((struct FLASH *) FLASH_R_BASE)
static struct FLASH *const FLASH = ((struct FLASH *const) FLASH_R_BASE);
static void __attribute__((used))
clock_init (void)
@@ -204,8 +193,8 @@ struct GPIO {
#define GPIOE_BASE (APB2PERIPH_BASE + 0x1800)
#define GPIOE ((struct GPIO *) GPIOE_BASE)
#define GPIO_USB ((struct GPIO *) GPIO_USB_BASE)
#define GPIO_LED ((struct GPIO *) GPIO_LED_BASE)
static struct GPIO *const GPIO_USB = ((struct GPIO *const) GPIO_USB_BASE);
static struct GPIO *const GPIO_LED = ((struct GPIO *const) GPIO_LED_BASE);
static void __attribute__((used))
gpio_init (void)

2
example-cdc/Makefile
View File

@@ -14,7 +14,7 @@ OBJCOPY = $(CROSS)objcopy
MCU = cortex-m3
CWARN = -Wall -Wextra -Wstrict-prototypes
DEFS = -DFREE_STANDING
DEFS = -DHAVE_SYS_H -DFREE_STANDING
OPT = -O3 -Os -g
LIBS =

9
example-cdc/sys.c
View File

@@ -21,10 +21,7 @@
#define CORTEX_PRIORITY_BITS 4
#define CORTEX_PRIORITY_MASK(n) ((n) << (8 - CORTEX_PRIORITY_BITS))
#define USB_LP_CAN1_RX0_IRQn 20
#define STM32_USB_IRQ_PRIORITY 11
#define FLASH_PAGE_SIZE 1024
#define STM32_USB_IRQ_PRIORITY 11
#define STM32_SW_PLL (2 << 0)
@@ -336,9 +333,7 @@ flash_unlock (void)
#define intr_disable() asm volatile ("cpsid i" : : : "memory")
#define intr_enable() asm volatile ("msr BASEPRI, %0\n\t" \
"cpsie i" : : "r" (0) : "memory")
#define intr_enable() asm volatile ("cpsie i" : : : "memory")
#define FLASH_SR_BSY 0x01
#define FLASH_SR_PGERR 0x04

20
example-cdc/sys.h
View File

@@ -93,3 +93,23 @@ nvic_system_reset (void)
{
(*vector[12]) ();
}
/*
* Users can override INLINE by 'attribute((used))' to have an
* implementation defined.
*/
#if !defined(INLINE)
#define INLINE __inline__
#endif
static INLINE void
clock_init (void)
{
(*vector[13]) ();
}
static INLINE void
gpio_init (void)
{
(*vector[14]) ();
}

4
example-led/Makefile
View File

@@ -14,8 +14,8 @@ OBJCOPY = $(CROSS)objcopy
MCU = cortex-m3
CWARN = -Wall -Wextra -Wstrict-prototypes
DEFS = -DFREE_STANDING
# DEFS = -DFREE_STANDING -DBUSY_LOOP -DCHX_FLAGS_MAIN=CHOPSTX_SCHED_RR
DEFS = -DHAVE_SYS_H -DFREE_STANDING
# DEFS = -DFREE_STANDING -DHAVE_SYS_H -DBUSY_LOOP -DCHX_FLAGS_MAIN=CHOPSTX_SCHED_RR
OPT = -O3 -Os -g
LIBS =

33
example-led/sys.c
View File

@@ -21,10 +21,7 @@
#define CORTEX_PRIORITY_BITS 4
#define CORTEX_PRIORITY_MASK(n) ((n) << (8 - CORTEX_PRIORITY_BITS))
#define USB_LP_CAN1_RX0_IRQn 20
#define STM32_USB_IRQ_PRIORITY 11
#define FLASH_PAGE_SIZE 1024
#define STM32_USB_IRQ_PRIORITY 11
#define STM32_SW_PLL (2 << 0)
@@ -78,19 +75,19 @@ struct NVIC {
uint32_t IPR[60];
};
#define NVICBase ((struct NVIC *)0xE000E100)
#define NVIC_ISER(n) (NVICBase->ISER[n])
#define NVIC_ICPR(n) (NVICBase->ICPR[n])
#define NVIC_IPR(n) (NVICBase->IPR[n])
static struct NVIC *const NVICBase = ((struct NVIC *const)0xE000E100);
#define NVIC_ISER(n) (NVICBase->ISER[n >> 5])
#define NVIC_ICPR(n) (NVICBase->ICPR[n >> 5])
#define NVIC_IPR(n) (NVICBase->IPR[n >> 2])
static void
nvic_enable_vector (uint32_t n, uint32_t prio)
{
unsigned int sh = (n & 3) << 3;
NVIC_IPR (n >> 2) = (NVIC_IPR(n >> 2) & ~(0xFF << sh)) | (prio << sh);
NVIC_ICPR (n >> 5) = 1 << (n & 0x1F);
NVIC_ISER (n >> 5) = 1 << (n & 0x1F);
NVIC_IPR (n) = (NVIC_IPR(n) & ~(0xFF << sh)) | (prio << sh);
NVIC_ICPR (n) = 1 << (n & 0x1F);
NVIC_ISER (n) = 1 << (n & 0x1F);
}
@@ -112,7 +109,7 @@ struct RCC {
};
#define RCC_BASE (AHBPERIPH_BASE + 0x1000)
#define RCC ((struct RCC *)RCC_BASE)
static struct RCC *const RCC = ((struct RCC *const)RCC_BASE);
#define RCC_APB1ENR_USBEN 0x00800000
#define RCC_APB1RSTR_USBRST 0x00800000
@@ -143,7 +140,7 @@ struct FLASH {
};
#define FLASH_R_BASE (AHBPERIPH_BASE + 0x2000)
#define FLASH ((struct FLASH *) FLASH_R_BASE)
static struct FLASH *const FLASH = ((struct FLASH *const) FLASH_R_BASE);
static void
clock_init (void)
@@ -215,8 +212,8 @@ struct GPIO {
#define GPIOE_BASE (APB2PERIPH_BASE + 0x1800)
#define GPIOE ((struct GPIO *) GPIOE_BASE)
#define GPIO_USB ((struct GPIO *) GPIO_USB_BASE)
#define GPIO_LED ((struct GPIO *) GPIO_LED_BASE)
static struct GPIO *const GPIO_USB = ((struct GPIO *const) GPIO_USB_BASE);
static struct GPIO *const GPIO_LED = ((struct GPIO *const) GPIO_LED_BASE);
static void
gpio_init (void)
@@ -336,9 +333,7 @@ flash_unlock (void)
#define intr_disable() asm volatile ("cpsid i" : : : "memory")
#define intr_enable() asm volatile ("msr BASEPRI, %0\n\t" \
"cpsie i" : : "r" (0) : "memory")
#define intr_enable() asm volatile ("cpsie i" : : : "memory")
#define FLASH_SR_BSY 0x01
#define FLASH_SR_PGERR 0x04
@@ -537,7 +532,7 @@ struct SCB
#define SCS_BASE (0xE000E000)
#define SCB_BASE (SCS_BASE + 0x0D00)
#define SCB ((struct SCB *) SCB_BASE)
static struct SCB *const SCB = ((struct SCB *const) SCB_BASE);
#define SYSRESETREQ 0x04
static void

20
example-led/sys.h
View File

@@ -93,3 +93,23 @@ nvic_system_reset (void)
{
(*vector[12]) ();
}
/*
* Users can override INLINE by 'attribute((used))' to have an
* implementation defined.
*/
#if !defined(INLINE)
#define INLINE __inline__
#endif
static INLINE void
clock_init (void)
{
(*vector[13]) ();
}
static INLINE void
gpio_init (void)
{
(*vector[14]) ();
}