From 9f16e5e051c2cf11465d00a2ee0265039e448b06 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Mon, 30 May 2016 14:57:10 +0900
Subject: consolidate mcu-chip specific code
---
example-cdc/Makefile | 7 +-
example-cdc/aes-constant-ft.c | 145 ------
example-cdc/sample.c | 9 +-
example-cdc/sample.ld | 8 +-
example-cdc/sys.c | 394 --------------
example-cdc/sys.h | 130 -----
example-cdc/usb_stm32f103.c | 1127 -----------------------------------------
7 files changed, 18 insertions(+), 1802 deletions(-)
delete mode 100644 example-cdc/aes-constant-ft.c
delete mode 100644 example-cdc/sys.c
delete mode 100644 example-cdc/sys.h
delete mode 100644 example-cdc/usb_stm32f103.c
(limited to 'example-cdc')
diff --git a/example-cdc/Makefile b/example-cdc/Makefile
index b6c4c76..2e6e667 100644
--- a/example-cdc/Makefile
+++ b/example-cdc/Makefile
@@ -4,7 +4,12 @@ PROJECT = sample
CHOPSTX = ..
LDSCRIPT= sample.ld
-CSRC = sys.c aes-constant-ft.c sample.c usb-cdc.c usb_stm32f103.c
+CSRC = sample.c usb-cdc.c
+
+CHIP=stm32f103
+
+USE_SYS = yes
+USE_USB = yes
###################################
CROSS = arm-none-eabi-
diff --git a/example-cdc/aes-constant-ft.c b/example-cdc/aes-constant-ft.c
deleted file mode 100644
index 21d1ba7..0000000
--- a/example-cdc/aes-constant-ft.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * aes-constant-ft.c - AES forward tables.
- *
- * We need something useful for the initial flash ROM page (4 Ki
- * bytes), which cannot be modified after installation. Even after
- * upgrade of the firmware, it stays intact.
- *
- * We decide to put 3/4 of AES forward tables to fill 3 Ki bytes, as
- * its useful and it won't change.
- *
- * The code was taken from aes.c of PolarSSL version 0.14, and then,
- * modified to add section names.
- *
- * Since this is just a data, it wouldn't be copyright-able, but the
- * original auther would claim so. Thus, we put original copyright
- * notice here. It is highly likely that there will be no such a
- * thing for copyright. Nevertheless, we think that PolarSSL is good
- * software to address here, and encourage people using it.
- *
- */
-
-#include <stdint.h>
-
-/*
- * Original copyright notice is below:
- */
-
-/*
- * FIPS-197 compliant AES implementation
- *
- * Copyright (C) 2006-2010, Brainspark B.V.
- *
- * This file is part of PolarSSL (http://www.polarssl.org)
- * Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
- *
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-/*
- * The AES block cipher was designed by Vincent Rijmen and Joan Daemen.
- *
- * http://csrc.nist.gov/encryption/aes/rijndael/Rijndael.pdf
- * http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
- */
-
-/*
- * Forward tables
- */
-#define FT \
-\
- V(A5,63,63,C6), V(84,7C,7C,F8), V(99,77,77,EE), V(8D,7B,7B,F6), \
- V(0D,F2,F2,FF), V(BD,6B,6B,D6), V(B1,6F,6F,DE), V(54,C5,C5,91), \
- V(50,30,30,60), V(03,01,01,02), V(A9,67,67,CE), V(7D,2B,2B,56), \
- V(19,FE,FE,E7), V(62,D7,D7,B5), V(E6,AB,AB,4D), V(9A,76,76,EC), \
- V(45,CA,CA,8F), V(9D,82,82,1F), V(40,C9,C9,89), V(87,7D,7D,FA), \
- V(15,FA,FA,EF), V(EB,59,59,B2), V(C9,47,47,8E), V(0B,F0,F0,FB), \
- V(EC,AD,AD,41), V(67,D4,D4,B3), V(FD,A2,A2,5F), V(EA,AF,AF,45), \
- V(BF,9C,9C,23), V(F7,A4,A4,53), V(96,72,72,E4), V(5B,C0,C0,9B), \
- V(C2,B7,B7,75), V(1C,FD,FD,E1), V(AE,93,93,3D), V(6A,26,26,4C), \
- V(5A,36,36,6C), V(41,3F,3F,7E), V(02,F7,F7,F5), V(4F,CC,CC,83), \
- V(5C,34,34,68), V(F4,A5,A5,51), V(34,E5,E5,D1), V(08,F1,F1,F9), \
- V(93,71,71,E2), V(73,D8,D8,AB), V(53,31,31,62), V(3F,15,15,2A), \
- V(0C,04,04,08), V(52,C7,C7,95), V(65,23,23,46), V(5E,C3,C3,9D), \
- V(28,18,18,30), V(A1,96,96,37), V(0F,05,05,0A), V(B5,9A,9A,2F), \
- V(09,07,07,0E), V(36,12,12,24), V(9B,80,80,1B), V(3D,E2,E2,DF), \
- V(26,EB,EB,CD), V(69,27,27,4E), V(CD,B2,B2,7F), V(9F,75,75,EA), \
- V(1B,09,09,12), V(9E,83,83,1D), V(74,2C,2C,58), V(2E,1A,1A,34), \
- V(2D,1B,1B,36), V(B2,6E,6E,DC), V(EE,5A,5A,B4), V(FB,A0,A0,5B), \
- V(F6,52,52,A4), V(4D,3B,3B,76), V(61,D6,D6,B7), V(CE,B3,B3,7D), \
- V(7B,29,29,52), V(3E,E3,E3,DD), V(71,2F,2F,5E), V(97,84,84,13), \
- V(F5,53,53,A6), V(68,D1,D1,B9), V(00,00,00,00), V(2C,ED,ED,C1), \
- V(60,20,20,40), V(1F,FC,FC,E3), V(C8,B1,B1,79), V(ED,5B,5B,B6), \
- V(BE,6A,6A,D4), V(46,CB,CB,8D), V(D9,BE,BE,67), V(4B,39,39,72), \
- V(DE,4A,4A,94), V(D4,4C,4C,98), V(E8,58,58,B0), V(4A,CF,CF,85), \
- V(6B,D0,D0,BB), V(2A,EF,EF,C5), V(E5,AA,AA,4F), V(16,FB,FB,ED), \
- V(C5,43,43,86), V(D7,4D,4D,9A), V(55,33,33,66), V(94,85,85,11), \
- V(CF,45,45,8A), V(10,F9,F9,E9), V(06,02,02,04), V(81,7F,7F,FE), \
- V(F0,50,50,A0), V(44,3C,3C,78), V(BA,9F,9F,25), V(E3,A8,A8,4B), \
- V(F3,51,51,A2), V(FE,A3,A3,5D), V(C0,40,40,80), V(8A,8F,8F,05), \
- V(AD,92,92,3F), V(BC,9D,9D,21), V(48,38,38,70), V(04,F5,F5,F1), \
- V(DF,BC,BC,63), V(C1,B6,B6,77), V(75,DA,DA,AF), V(63,21,21,42), \
- V(30,10,10,20), V(1A,FF,FF,E5), V(0E,F3,F3,FD), V(6D,D2,D2,BF), \
- V(4C,CD,CD,81), V(14,0C,0C,18), V(35,13,13,26), V(2F,EC,EC,C3), \
- V(E1,5F,5F,BE), V(A2,97,97,35), V(CC,44,44,88), V(39,17,17,2E), \
- V(57,C4,C4,93), V(F2,A7,A7,55), V(82,7E,7E,FC), V(47,3D,3D,7A), \
- V(AC,64,64,C8), V(E7,5D,5D,BA), V(2B,19,19,32), V(95,73,73,E6), \
- V(A0,60,60,C0), V(98,81,81,19), V(D1,4F,4F,9E), V(7F,DC,DC,A3), \
- V(66,22,22,44), V(7E,2A,2A,54), V(AB,90,90,3B), V(83,88,88,0B), \
- V(CA,46,46,8C), V(29,EE,EE,C7), V(D3,B8,B8,6B), V(3C,14,14,28), \
- V(79,DE,DE,A7), V(E2,5E,5E,BC), V(1D,0B,0B,16), V(76,DB,DB,AD), \
- V(3B,E0,E0,DB), V(56,32,32,64), V(4E,3A,3A,74), V(1E,0A,0A,14), \
- V(DB,49,49,92), V(0A,06,06,0C), V(6C,24,24,48), V(E4,5C,5C,B8), \
- V(5D,C2,C2,9F), V(6E,D3,D3,BD), V(EF,AC,AC,43), V(A6,62,62,C4), \
- V(A8,91,91,39), V(A4,95,95,31), V(37,E4,E4,D3), V(8B,79,79,F2), \
- V(32,E7,E7,D5), V(43,C8,C8,8B), V(59,37,37,6E), V(B7,6D,6D,DA), \
- V(8C,8D,8D,01), V(64,D5,D5,B1), V(D2,4E,4E,9C), V(E0,A9,A9,49), \
- V(B4,6C,6C,D8), V(FA,56,56,AC), V(07,F4,F4,F3), V(25,EA,EA,CF), \
- V(AF,65,65,CA), V(8E,7A,7A,F4), V(E9,AE,AE,47), V(18,08,08,10), \
- V(D5,BA,BA,6F), V(88,78,78,F0), V(6F,25,25,4A), V(72,2E,2E,5C), \
- V(24,1C,1C,38), V(F1,A6,A6,57), V(C7,B4,B4,73), V(51,C6,C6,97), \
- V(23,E8,E8,CB), V(7C,DD,DD,A1), V(9C,74,74,E8), V(21,1F,1F,3E), \
- V(DD,4B,4B,96), V(DC,BD,BD,61), V(86,8B,8B,0D), V(85,8A,8A,0F), \
- V(90,70,70,E0), V(42,3E,3E,7C), V(C4,B5,B5,71), V(AA,66,66,CC), \
- V(D8,48,48,90), V(05,03,03,06), V(01,F6,F6,F7), V(12,0E,0E,1C), \
- V(A3,61,61,C2), V(5F,35,35,6A), V(F9,57,57,AE), V(D0,B9,B9,69), \
- V(91,86,86,17), V(58,C1,C1,99), V(27,1D,1D,3A), V(B9,9E,9E,27), \
- V(38,E1,E1,D9), V(13,F8,F8,EB), V(B3,98,98,2B), V(33,11,11,22), \
- V(BB,69,69,D2), V(70,D9,D9,A9), V(89,8E,8E,07), V(A7,94,94,33), \
- V(B6,9B,9B,2D), V(22,1E,1E,3C), V(92,87,87,15), V(20,E9,E9,C9), \
- V(49,CE,CE,87), V(FF,55,55,AA), V(78,28,28,50), V(7A,DF,DF,A5), \
- V(8F,8C,8C,03), V(F8,A1,A1,59), V(80,89,89,09), V(17,0D,0D,1A), \
- V(DA,BF,BF,65), V(31,E6,E6,D7), V(C6,42,42,84), V(B8,68,68,D0), \
- V(C3,41,41,82), V(B0,99,99,29), V(77,2D,2D,5A), V(11,0F,0F,1E), \
- V(CB,B0,B0,7B), V(FC,54,54,A8), V(D6,BB,BB,6D), V(3A,16,16,2C)
-
-#define V(a,b,c,d) 0x##a##b##c##d
-const uint32_t FT0[256] __attribute__((section(".sys.0"))) = { FT };
-#undef V
-
-#define V(a,b,c,d) 0x##b##c##d##a
-const uint32_t FT1[256] __attribute__((section(".sys.1"))) = { FT };
-#undef V
-
-#define V(a,b,c,d) 0x##c##d##a##b
-const uint32_t FT2[256] __attribute__((section(".sys.2"))) = { FT };
-#undef V
-
-#ifdef ORIGINAL_IMPLEMENTATION
-#define V(a,b,c,d) 0x##d##a##b##c
-const uint32_t FT3[256] = { FT };
-#undef V
-#endif
diff --git a/example-cdc/sample.c b/example-cdc/sample.c
index cb6c5ae..db23133 100644
--- a/example-cdc/sample.c
+++ b/example-cdc/sample.c
@@ -3,10 +3,17 @@
#include <string.h>
#include <chopstx.h>
-#include "sys.h" /* for set_led */
#include "usb_lld.h"
#include "tty.h"
+/* For set_led */
+#include "board.h"
+#ifdef MCU_KINETIS_L
+#include "mcu/sys-mkl27z.h"
+#else
+#include "mcu/sys-stm32f103.h"
+#endif
+
static chopstx_mutex_t mtx;
static chopstx_cond_t cnd0;
static chopstx_cond_t cnd1;
diff --git a/example-cdc/sample.ld b/example-cdc/sample.ld
index 9b7eca3..5bb17e1 100644
--- a/example-cdc/sample.ld
+++ b/example-cdc/sample.ld
@@ -30,10 +30,10 @@ SECTIONS
KEEP(*(.sys.version))
KEEP(*(.sys.board_id))
KEEP(*(.sys.board_name))
- build/sys.o(.text)
- build/sys.o(.text.*)
- build/sys.o(.rodata)
- build/sys.o(.rodata.*)
+ build/sys-*.o(.text)
+ build/sys-*.o(.text.*)
+ build/sys-*.o(.rodata)
+ build/sys-*.o(.rodata.*)
. = ALIGN(1024);
*(.sys.0)
*(.sys.1)
diff --git a/example-cdc/sys.c b/example-cdc/sys.c
deleted file mode 100644
index d73b709..0000000
--- a/example-cdc/sys.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * sys.c - system routines for the initial page for STM32F103.
- *
- * Copyright (C) 2013, 2014, 2015, 2016 Flying Stone Technology
- * Author: NIIBE Yutaka <gniibe@fsij.org>
- *
- * Copying and distribution of this file, with or without modification,
- * are permitted in any medium without royalty provided the copyright
- * notice and this notice are preserved. This file is offered as-is,
- * without any warranty.
- *
- * When the flash ROM is protected, we cannot modify the initial page.
- * We put some system routines (which is useful for any program) here.
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include "board.h"
-
-#include "mcu/clk_gpio_init-stm32.c"
-
-
-static void
-usb_cable_config (int enable)
-{
-#if defined(GPIO_USB_SET_TO_ENABLE)
- if (enable)
- GPIO_USB->BSRR = (1 << GPIO_USB_SET_TO_ENABLE);
- else
- GPIO_USB->BRR = (1 << GPIO_USB_SET_TO_ENABLE);
-#elif defined(GPIO_USB_CLEAR_TO_ENABLE)
- if (enable)
- GPIO_USB->BRR = (1 << GPIO_USB_CLEAR_TO_ENABLE);
- else
- GPIO_USB->BSRR = (1 << GPIO_USB_CLEAR_TO_ENABLE);
-#else
- (void)enable;
-#endif
-}
-
-void
-set_led (int on)
-{
-#if defined(GPIO_LED_CLEAR_TO_EMIT)
- if (on)
- GPIO_LED->BRR = (1 << GPIO_LED_CLEAR_TO_EMIT);
- else
- GPIO_LED->BSRR = (1 << GPIO_LED_CLEAR_TO_EMIT);
-#else
- if (on)
- GPIO_LED->BSRR = (1 << GPIO_LED_SET_TO_EMIT);
- else
- GPIO_LED->BRR = (1 << GPIO_LED_SET_TO_EMIT);
-#endif
-}
-
-static void wait (int count)
-{
- int i;
-
- for (i = 0; i < count; i++)
- asm volatile ("" : : "r" (i) : "memory");
-}
-
-
-static void
-usb_lld_sys_shutdown (void)
-{
- RCC->APB1ENR &= ~RCC_APB1ENR_USBEN;
- RCC->APB1RSTR = RCC_APB1RSTR_USBRST;
- usb_cable_config (0);
-}
-
-static void
-usb_lld_sys_init (void)
-{
- if ((RCC->APB1ENR & RCC_APB1ENR_USBEN)
- && (RCC->APB1RSTR & RCC_APB1RSTR_USBRST) == 0)
- /* Make sure the device is disconnected, even after core reset. */
- {
- usb_lld_sys_shutdown ();
- /* Disconnect requires SE0 (>= 2.5uS). */
- wait (300);
- }
-
- usb_cable_config (1);
- RCC->APB1ENR |= RCC_APB1ENR_USBEN;
- RCC->APB1RSTR = RCC_APB1RSTR_USBRST;
- RCC->APB1RSTR = 0;
-}
-
-#define FLASH_KEY1 0x45670123UL
-#define FLASH_KEY2 0xCDEF89ABUL
-
-enum flash_status
-{
- FLASH_BUSY = 1,
- FLASH_ERROR_PG,
- FLASH_ERROR_WRP,
- FLASH_COMPLETE,
- FLASH_TIMEOUT
-};
-
-static void __attribute__ ((used))
-flash_unlock (void)
-{
- FLASH->KEYR = FLASH_KEY1;
- FLASH->KEYR = FLASH_KEY2;
-}
-
-
-#define intr_disable() asm volatile ("cpsid i" : : : "memory")
-#define intr_enable() asm volatile ("cpsie i" : : : "memory")
-
-#define FLASH_SR_BSY 0x01
-#define FLASH_SR_PGERR 0x04
-#define FLASH_SR_WRPRTERR 0x10
-#define FLASH_SR_EOP 0x20
-
-#define FLASH_CR_PG 0x0001
-#define FLASH_CR_PER 0x0002
-#define FLASH_CR_MER 0x0004
-#define FLASH_CR_OPTPG 0x0010
-#define FLASH_CR_OPTER 0x0020
-#define FLASH_CR_STRT 0x0040
-#define FLASH_CR_LOCK 0x0080
-#define FLASH_CR_OPTWRE 0x0200
-#define FLASH_CR_ERRIE 0x0400
-#define FLASH_CR_EOPIE 0x1000
-
-static int
-flash_wait_for_last_operation (uint32_t timeout)
-{
- int status;
-
- do
- {
- status = FLASH->SR;
- if (--timeout == 0)
- break;
- }
- while ((status & FLASH_SR_BSY) != 0);
-
- return status & (FLASH_SR_BSY|FLASH_SR_PGERR|FLASH_SR_WRPRTERR);
-}
-
-#define FLASH_PROGRAM_TIMEOUT 0x00010000
-#define FLASH_ERASE_TIMEOUT 0x01000000
-
-static int
-flash_program_halfword (uint32_t addr, uint16_t data)
-{
- int status;
-
- status = flash_wait_for_last_operation (FLASH_PROGRAM_TIMEOUT);
-
- intr_disable ();
- if (status == 0)
- {
- FLASH->CR |= FLASH_CR_PG;
-
- *(volatile uint16_t *)addr = data;
-
- status = flash_wait_for_last_operation (FLASH_PROGRAM_TIMEOUT);
- FLASH->CR &= ~FLASH_CR_PG;
- }
- intr_enable ();
-
- return status;
-}
-
-static int
-flash_erase_page (uint32_t addr)
-{
- int status;
-
- status = flash_wait_for_last_operation (FLASH_ERASE_TIMEOUT);
-
- intr_disable ();
- if (status == 0)
- {
- FLASH->CR |= FLASH_CR_PER;
- FLASH->AR = addr;
- FLASH->CR |= FLASH_CR_STRT;
-
- status = flash_wait_for_last_operation (FLASH_ERASE_TIMEOUT);
- FLASH->CR &= ~FLASH_CR_PER;
- }
- intr_enable ();
-
- return status;
-}
-
-static int
-flash_check_blank (const uint8_t *p_start, size_t size)
-{
- const uint8_t *p;
-
- for (p = p_start; p < p_start + size; p++)
- if (*p != 0xff)
- return 0;
-
- return 1;
-}
-
-#define FLASH_START_ADDR 0x08000000 /* Fixed for all STM32F1. */
-#define FLASH_OFFSET 0x1000 /* First pages are not-writable. */
-#define FLASH_START (FLASH_START_ADDR+FLASH_OFFSET)
-#define CHIP_ID_REG ((uint32_t *)0xe0042000)
-#define FLASH_SIZE_REG ((uint16_t *)0x1ffff7e0)
-
-static int
-flash_write (uint32_t dst_addr, const uint8_t *src, size_t len)
-{
- int status;
- uint32_t flash_end = FLASH_START_ADDR + (*FLASH_SIZE_REG)*1024;
-
- if (dst_addr < FLASH_START || dst_addr + len > flash_end)
- return 0;
-
- while (len)
- {
- uint16_t hw = *src++;
-
- hw |= (*src++ << 8);
- status = flash_program_halfword (dst_addr, hw);
- if (status != 0)
- return 0; /* error return */
-
- dst_addr += 2;
- len -= 2;
- }
-
- return 1;
-}
-
-#define OPTION_BYTES_ADDR 0x1ffff800
-
-static int
-flash_protect (void)
-{
- int status;
- uint32_t option_bytes_value;
-
- status = flash_wait_for_last_operation (FLASH_ERASE_TIMEOUT);
-
- intr_disable ();
- if (status == 0)
- {
- FLASH->OPTKEYR = FLASH_KEY1;
- FLASH->OPTKEYR = FLASH_KEY2;
-
- FLASH->CR |= FLASH_CR_OPTER;
- FLASH->CR |= FLASH_CR_STRT;
-
- status = flash_wait_for_last_operation (FLASH_ERASE_TIMEOUT);
- FLASH->CR &= ~FLASH_CR_OPTER;
- }
- intr_enable ();
-
- if (status != 0)
- return 0;
-
- option_bytes_value = *(uint32_t *)OPTION_BYTES_ADDR;
- return (option_bytes_value & 0xff) == 0xff ? 1 : 0;
-}
-
-static void __attribute__((naked))
-flash_erase_all_and_exec (void (*entry)(void))
-{
- uint32_t addr = FLASH_START;
- uint32_t end = FLASH_START_ADDR + (*FLASH_SIZE_REG)*1024;
- uint32_t page_size = 1024;
- int r;
-
- if (((*CHIP_ID_REG) & 0xfff) == 0x0414)
- page_size = 2048;
-
- while (addr < end)
- {
- r = flash_erase_page (addr);
- if (r != 0)
- break;
-
- addr += page_size;
- }
-
- if (addr >= end)
- (*entry) ();
-
- for (;;);
-}
-
-struct SCB
-{
- volatile uint32_t CPUID;
- volatile uint32_t ICSR;
- volatile uint32_t VTOR;
- volatile uint32_t AIRCR;
- volatile uint32_t SCR;
- volatile uint32_t CCR;
- volatile uint8_t SHP[12];
- volatile uint32_t SHCSR;
- volatile uint32_t CFSR;
- volatile uint32_t HFSR;
- volatile uint32_t DFSR;
- volatile uint32_t MMFAR;
- volatile uint32_t BFAR;
- volatile uint32_t AFSR;
- volatile uint32_t PFR[2];
- volatile uint32_t DFR;
- volatile uint32_t ADR;
- volatile uint32_t MMFR[4];
- volatile uint32_t ISAR[5];
-};
-
-#define SCS_BASE (0xE000E000)
-#define SCB_BASE (SCS_BASE + 0x0D00)
-static struct SCB *const SCB = ((struct SCB *const) SCB_BASE);
-
-#define SYSRESETREQ 0x04
-static void
-nvic_system_reset (void)
-{
- SCB->AIRCR = (0x05FA0000 | (SCB->AIRCR & 0x70) | SYSRESETREQ);
- asm volatile ("dsb");
- for (;;);
-}
-
-static void __attribute__ ((naked))
-reset (void)
-{
- extern const unsigned long *FT0, *FT1, *FT2;
-
- /*
- * This code may not be at the start of flash ROM, because of DFU.
- * So, we take the address from PC.
- */
- asm volatile ("cpsid i\n\t" /* Mask all interrupts. */
- "ldr r0, 1f\n\t" /* r0 = SCR */
- "mov r1, pc\n\t" /* r1 = (PC + 0x1000) & ~0x0fff */
- "mov r2, #0x1000\n\t"
- "add r1, r1, r2\n\t"
- "sub r2, r2, #1\n\t"
- "bic r1, r1, r2\n\t"
- "str r1, [r0, #8]\n\t" /* Set SCR->VCR */
- "ldr r0, [r1], #4\n\t"
- "msr MSP, r0\n\t" /* Main (exception handler) stack. */
- "ldr r0, [r1]\n\t" /* Reset handler. */
- "bx r0\n\t"
- ".align 2\n"
- "1: .word 0xe000ed00"
- : /* no output */ : /* no input */ : "memory");
-
- /* Never reach here. */
- /* Artificial entry to refer FT0, FT1, and FT2. */
- asm volatile (""
- : : "r" (FT0), "r" (FT1), "r" (FT2));
-}
-
-typedef void (*handler)(void);
-extern uint8_t __ram_end__;
-
-handler vector[] __attribute__ ((section(".vectors"))) = {
- (handler)&__ram_end__,
- reset,
- (handler)set_led,
- flash_unlock,
- (handler)flash_program_halfword,
- (handler)flash_erase_page,
- (handler)flash_check_blank,
- (handler)flash_write,
- (handler)flash_protect,
- (handler)flash_erase_all_and_exec,
- usb_lld_sys_init,
- usb_lld_sys_shutdown,
- nvic_system_reset,
- clock_init,
- gpio_init,
- NULL,
-};
-
-const uint8_t sys_version[8] __attribute__((section(".sys.version"))) = {
- 3*2+2, /* bLength */
- 0x03, /* bDescriptorType = USB_STRING_DESCRIPTOR_TYPE */
- /* sys version: "3.0" */
- '3', 0, '.', 0, '0', 0,
-};
-
-const uint32_t __attribute__((section(".sys.board_id")))
-sys_board_id = BOARD_ID;
-
-const uint8_t __attribute__((section(".sys.board_name")))
-sys_board_name[] = BOARD_NAME;
diff --git a/example-cdc/sys.h b/example-cdc/sys.h
deleted file mode 100644
index aa7825d..0000000
--- a/example-cdc/sys.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#define BOARD_ID_CQ_STARM 0xc5480875
-#define BOARD_ID_FST_01_00 0x613870a9
-#define BOARD_ID_FST_01 0x696886af
-#define BOARD_ID_MAPLE_MINI 0x7a445272
-#define BOARD_ID_OLIMEX_STM32_H103 0xf92bb594
-#define BOARD_ID_STBEE_MINI 0x1f341961
-#define BOARD_ID_STBEE 0x945c37e8
-#define BOARD_ID_STM32_PRIMER2 0x21e5798d
-#define BOARD_ID_STM8S_DISCOVERY 0x2f0976bb
-#define BOARD_ID_ST_DONGLE 0x2cd4e471
-#define BOARD_ID_ST_NUCLEO_F103 0x9b87c16d
-#define BOARD_ID_NITROKEY_START 0xad1e7ebd
-
-extern const uint8_t sys_version[8];
-extern const uint32_t sys_board_id;
-extern const uint8_t sys_board_name[];
-
-typedef void (*handler)(void);
-extern handler vector[16];
-
-static inline const uint8_t *
-unique_device_id (void)
-{
- /* STM32F103 has 96-bit unique device identifier */
- const uint8_t *addr = (const uint8_t *)0x1ffff7e8;
-
- return addr;
-}
-
-static inline void
-set_led (int on)
-{
- void (*func) (int) = (void (*)(int))vector[2];
-
- return (*func) (on);
-}
-
-static inline void
-flash_unlock (void)
-{
- (*vector[3]) ();
-}
-
-static inline int
-flash_program_halfword (uint32_t addr, uint16_t data)
-{
- int (*func) (uint32_t, uint16_t) = (int (*)(uint32_t, uint16_t))vector[4];
-
- return (*func) (addr, data);
-}
-
-static inline int
-flash_erase_page (uint32_t addr)
-{
- int (*func) (uint32_t) = (int (*)(uint32_t))vector[5];
-
- return (*func) (addr);
-}
-
-static inline int
-flash_check_blank (const uint8_t *p_start, size_t size)
-{
- int (*func) (const uint8_t *, int) = (int (*)(const uint8_t *, int))vector[6];
-
- return (*func) (p_start, size);
-}
-
-static inline int
-flash_write (uint32_t dst_addr, const uint8_t *src, size_t len)
-{
- int (*func) (uint32_t, const uint8_t *, size_t)
- = (int (*)(uint32_t, const uint8_t *, size_t))vector[7];
-
- return (*func) (dst_addr, src, len);
-}
-
-static inline int
-flash_protect (void)
-{
- int (*func) (void) = (int (*)(void))vector[8];
-
- return (*func) ();
-}
-
-static inline void __attribute__((noreturn))
-flash_erase_all_and_exec (void (*entry)(void))
-{
- void (*func) (void (*)(void)) = (void (*)(void (*)(void)))vector[9];
-
- (*func) (entry);
- for (;;);
-}
-
-static inline void
-usb_lld_sys_init (void)
-{
- (*vector[10]) ();
-}
-
-static inline void
-usb_lld_sys_shutdown (void)
-{
- (*vector[11]) ();
-}
-
-static inline void
-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]) ();
-}
diff --git a/example-cdc/usb_stm32f103.c b/example-cdc/usb_stm32f103.c
deleted file mode 100644
index 80fbcc7..0000000
--- a/example-cdc/usb_stm32f103.c
+++ /dev/null
@@ -1,1127 +0,0 @@
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "sys.h"
-#include "usb_lld.h"
-
-#define USB_MAX_PACKET_SIZE 64 /* For FS device */
-
-enum STANDARD_REQUESTS
-{
- GET_STATUS = 0,
- CLEAR_FEATURE,
- RESERVED1,
- SET_FEATURE,
- RESERVED2,
- SET_ADDRESS,
- GET_DESCRIPTOR,
- SET_DESCRIPTOR,
- GET_CONFIGURATION,
- SET_CONFIGURATION,
- GET_INTERFACE,
- SET_INTERFACE,
- SYNCH_FRAME,
- TOTAL_REQUEST /* Total number of Standard request */
-};
-
-/* The state machine states of a control pipe */
-enum CONTROL_STATE
-{
- WAIT_SETUP,
- SETTING_UP,
- IN_DATA,
- OUT_DATA,
- LAST_IN_DATA,
- WAIT_STATUS_IN,
- WAIT_STATUS_OUT,
- STALLED,
- PAUSE
-};
-
-enum FEATURE_SELECTOR
-{
- ENDPOINT_STALL,
- DEVICE_REMOTE_WAKEUP
-};
-
-struct DATA_INFO
-{
- uint8_t *addr;
- uint16_t len;
- uint8_t require_zlp;
-};
-
-
-struct DEVICE_INFO
-{
- uint8_t current_configuration;
- uint8_t current_feature;
- uint8_t state;
- /**/
- uint8_t bmRequestType;
- uint8_t bRequest;
- /**/
- uint16_t value;
- uint16_t index;
- uint16_t len;
-};
-
-static struct DEVICE_INFO device_info;
-static struct DATA_INFO data_info;
-
-static struct DEVICE_INFO *const dev_p = &device_info;
-static struct DATA_INFO *const data_p = &data_info;
-
-#define REG_BASE (0x40005C00UL) /* USB_IP Peripheral Registers base address */
-#define PMA_ADDR (0x40006000UL) /* USB_IP Packet Memory Area base address */
-
-/* Control register */
-#define CNTR ((volatile uint16_t *)(REG_BASE + 0x40))
-/* Interrupt status register */
-#define ISTR ((volatile uint16_t *)(REG_BASE + 0x44))
-/* Frame number register */
-#define FNR ((volatile uint16_t *)(REG_BASE + 0x48))
-/* Device address register */
-#define DADDR ((volatile uint16_t *)(REG_BASE + 0x4C))
-/* Buffer Table address register */
-#define BTABLE ((volatile uint16_t *)(REG_BASE + 0x50))
-
-#define ISTR_CTR (0x8000) /* Correct TRansfer (read-only bit) */
-#define ISTR_OVR (0x4000) /* OVeR/underrun (clear-only bit) */
-#define ISTR_ERR (0x2000) /* ERRor (clear-only bit) */
-#define ISTR_WKUP (0x1000) /* WaKe UP (clear-only bit) */
-#define ISTR_SUSP (0x0800) /* SUSPend (clear-only bit) */
-#define ISTR_RESET (0x0400) /* RESET (clear-only bit) */
-#define ISTR_SOF (0x0200) /* Start Of Frame (clear-only bit) */
-#define ISTR_ESOF (0x0100) /* Expected Start Of Frame (clear-only bit) */
-
-#define ISTR_DIR (0x0010) /* DIRection of transaction (read-only bit) */
-#define ISTR_EP_ID (0x000F) /* EndPoint IDentifier (read-only bit) */
-
-#define CLR_OVR (~ISTR_OVR) /* clear OVeR/underrun bit*/
-#define CLR_ERR (~ISTR_ERR) /* clear ERRor bit */
-#define CLR_WKUP (~ISTR_WKUP) /* clear WaKe UP bit */
-#define CLR_SUSP (~ISTR_SUSP) /* clear SUSPend bit */
-#define CLR_RESET (~ISTR_RESET) /* clear RESET bit */
-#define CLR_SOF (~ISTR_SOF) /* clear Start Of Frame bit */
-#define CLR_ESOF (~ISTR_ESOF) /* clear Expected Start Of Frame bit */
-
-#define CNTR_CTRM (0x8000) /* Correct TRansfer Mask */
-#define CNTR_OVRM (0x4000) /* OVeR/underrun Mask */
-#define CNTR_ERRM (0x2000) /* ERRor Mask */
-#define CNTR_WKUPM (0x1000) /* WaKe UP Mask */
-#define CNTR_SUSPM (0x0800) /* SUSPend Mask */
-#define CNTR_RESETM (0x0400) /* RESET Mask */
-#define CNTR_SOFM (0x0200) /* Start Of Frame Mask */
-#define CNTR_ESOFM (0x0100) /* Expected Start Of Frame Mask */
-
-#define CNTR_RESUME (0x0010) /* RESUME request */
-#define CNTR_FSUSP (0x0008) /* Force SUSPend */
-#define CNTR_LPMODE (0x0004) /* Low-power MODE */
-#define CNTR_PDWN (0x0002) /* Power DoWN */
-#define CNTR_FRES (0x0001) /* Force USB RESet */
-
-#define DADDR_EF (0x80)
-#define DADDR_ADD (0x7F)
-
-#define EP_CTR_RX (0x8000) /* EndPoint Correct TRansfer RX */
-#define EP_DTOG_RX (0x4000) /* EndPoint Data TOGGLE RX */
-#define EPRX_STAT (0x3000) /* EndPoint RX STATus bit field */
-#define EP_SETUP (0x0800) /* EndPoint SETUP */
-#define EP_T_FIELD (0x0600) /* EndPoint TYPE */
-#define EP_KIND (0x0100) /* EndPoint KIND */
-#define EP_CTR_TX (0x0080) /* EndPoint Correct TRansfer TX */
-#define EP_DTOG_TX (0x0040) /* EndPoint Data TOGGLE TX */
-#define EPTX_STAT (0x0030) /* EndPoint TX STATus bit field */
-#define EPADDR_FIELD (0x000F) /* EndPoint ADDRess FIELD */
-
-#define EPREG_MASK (EP_CTR_RX|EP_SETUP|EP_T_FIELD|EP_KIND|EP_CTR_TX|EPADDR_FIELD)
-
-/* STAT_TX[1:0] STATus for TX transfer */
-#define EP_TX_DIS (0x0000) /* EndPoint TX DISabled */
-#define EP_TX_STALL (0x0010) /* EndPoint TX STALLed */
-#define EP_TX_NAK (0x0020) /* EndPoint TX NAKed */
-#define EP_TX_VALID (0x0030) /* EndPoint TX VALID */
-#define EPTX_DTOG1 (0x0010) /* EndPoint TX Data TOGgle bit1 */
-#define EPTX_DTOG2 (0x0020) /* EndPoint TX Data TOGgle bit2 */
-
-/* STAT_RX[1:0] STATus for RX transfer */
-#define EP_RX_DIS (0x0000) /* EndPoint RX DISabled */
-#define EP_RX_STALL (0x1000) /* EndPoint RX STALLed */
-#define EP_RX_NAK (0x2000) /* EndPoint RX NAKed */
-#define EP_RX_VALID (0x3000) /* EndPoint RX VALID */
-#define EPRX_DTOG1 (0x1000) /* EndPoint RX Data TOGgle bit1 */
-#define EPRX_DTOG2 (0x2000) /* EndPoint RX Data TOGgle bit1 */
-
-static void usb_handle_transfer (uint16_t istr_value);
-
-static void st103_set_btable (void)
-{
- *BTABLE = 0;
-}
-
-static uint16_t st103_get_istr (void)
-{
- return *ISTR;
-}
-
-static void st103_set_istr (uint16_t istr)
-{
- *ISTR = istr;
-}
-
-static void st103_set_cntr (uint16_t cntr)
-{
- *CNTR = cntr;
-}
-
-static void st103_set_daddr (uint16_t daddr)
-{
- *DADDR = daddr | DADDR_EF;
-}
-
-static void st103_set_epreg (uint8_t ep_num, uint16_t value)
-{
- uint16_t *reg_p = (uint16_t *)(REG_BASE + ep_num*4);
-
- *reg_p = value;
-}
-
-static uint16_t st103_get_epreg (uint8_t ep_num)
-{
- uint16_t *reg_p = (uint16_t *)(REG_BASE + ep_num*4);
-
- return *reg_p;
-}
-
-static void st103_set_tx_addr (uint8_t ep_num, uint16_t addr)
-{
- uint16_t *reg_p = (uint16_t *)(PMA_ADDR + (ep_num*8+0)*2);
-
- *reg_p = addr;
-}
-
-static uint16_t st103_get_tx_addr (uint8_t ep_num)
-{
- uint16_t *reg_p = (uint16_t *)(PMA_ADDR + (ep_num*8+0)*2);
-
- return *reg_p;
-}
-
-
-static void st103_set_tx_count (uint8_t ep_num, uint16_t size)
-{
- uint16_t *reg_p = (uint16_t *)(PMA_ADDR + (ep_num*8+2)*2);
-
- *reg_p = size;
-}
-
-static uint16_t st103_get_tx_count (uint8_t ep_num)
-{
- uint16_t *reg_p = (uint16_t *)(PMA_ADDR + (ep_num*8+2)*2);
-
- return *reg_p & 0x03ff;
-}
-
-
-static void st103_set_rx_addr (uint8_t ep_num, uint16_t addr)
-{
- uint16_t *reg_p = (uint16_t *)(PMA_ADDR + (ep_num*8+4)*2);
-
- *reg_p = addr;
-}
-
-static uint16_t st103_get_rx_addr (uint8_t ep_num)
-{
- uint16_t *reg_p = (uint16_t *)(PMA_ADDR + (ep_num*8+4)*2);
-
- return *reg_p;
-}
-
-
-static void st103_set_rx_buf_size (uint8_t ep_num, uint16_t size)
-{ /* Assume size is even */
- uint16_t *reg_p = (uint16_t *)(PMA_ADDR + (ep_num*8+6)*2);
- uint16_t value;
-
- if (size <= 62)
- value = (size & 0x3e) << 9;
- else
- value = 0x8000 | (((size >> 5) - 1) << 10);
-
- *reg_p = value;
-}
-
-static uint16_t st103_get_rx_count (uint8_t ep_num)
-{
- uint16_t *reg_p = (uint16_t *)(PMA_ADDR + (ep_num*8+6)*2);
-
- return *reg_p & 0x03ff;
-}
-
-
-static void st103_ep_clear_ctr_rx (uint8_t ep_num)
-{
- uint16_t value = st103_get_epreg (ep_num) & ~EP_CTR_RX & EPREG_MASK;
-
- st103_set_epreg (ep_num, value);
-}
-
-static void st103_ep_clear_ctr_tx (uint8_t ep_num)
-{
- uint16_t value = st103_get_epreg (ep_num) & ~EP_CTR_TX & EPREG_MASK;
-
- st103_set_epreg (ep_num, value);
-}
-
-static void st103_ep_set_rxtx_status (uint8_t ep_num, uint16_t st_rx,
- uint16_t st_tx)
-{
- uint16_t value = st103_get_epreg (ep_num);
-
- value &= (EPREG_MASK|EPRX_STAT|EPTX_STAT);
- value ^= (EPRX_DTOG1 & st_rx);
- value ^= (EPRX_DTOG2 & st_rx);
- value ^= (EPTX_DTOG1 & st_tx);
- value ^= (EPTX_DTOG2 & st_tx);
- value |= EP_CTR_RX | EP_CTR_TX;
- st103_set_epreg (ep_num, value);
-}
-
-static void st103_ep_set_rx_status (uint8_t ep_num, uint16_t st_rx)
-{
- uint16_t value = st103_get_epreg (ep_num);
-
- value &= (EPREG_MASK|EPRX_STAT);
- value ^= (EPRX_DTOG1 & st_rx);
- value ^= (EPRX_DTOG2 & st_rx);
- value |= EP_CTR_RX | EP_CTR_TX;
- st103_set_epreg (ep_num, value);
-}
-
-static uint16_t st103_ep_get_rx_status (uint8_t ep_num)
-{
- uint16_t value = st103_get_epreg (ep_num);
-
- return value & EPRX_STAT;
-}
-
-static void st103_ep_set_tx_status (uint8_t ep_num, uint16_t st_tx)
-{
- uint16_t value = st103_get_epreg (ep_num);
-
- value &= (EPREG_MASK|EPTX_STAT);
- value ^= (EPTX_DTOG1 & st_tx);
- value ^= (EPTX_DTOG2 & st_tx);
- value |= EP_CTR_RX | EP_CTR_TX;
- st103_set_epreg (ep_num, value);
-}
-
-static uint16_t st103_ep_get_tx_status (uint8_t ep_num)
-{
- uint16_t value = st103_get_epreg (ep_num);
-
- return value & EPTX_STAT;
-}
-
-static void st103_ep_clear_dtog_rx (uint8_t ep_num)
-{
- uint16_t value = st103_get_epreg (ep_num);
-
- if ((value & EP_DTOG_RX))
- {
- value &= EPREG_MASK;
- value |= EP_CTR_RX | EP_CTR_TX | EP_DTOG_RX;
- st103_set_epreg (ep_num, value);
- }
-}
-
-static void st103_ep_clear_dtog_tx (uint8_t ep_num)
-{
- uint16_t value = st103_get_epreg (ep_num);
-
- if ((value & EP_DTOG_TX))
- {
- value &= EPREG_MASK;
- value |= EP_CTR_RX | EP_CTR_TX | EP_DTOG_TX;
- st103_set_epreg (ep_num, value);
- }
-}
-
-void usb_lld_init (uint8_t feature)
-{
- usb_lld_sys_init ();
-
- dev_p->state = IN_DATA;
-
- usb_lld_set_configuration (0);
- dev_p->current_feature = feature;
-
- /* Reset USB */
- st103_set_cntr (CNTR_FRES);
- st103_set_cntr (0);
-
- /* Clear Interrupt Status Register, and enable interrupt for USB */
- st103_set_istr (0);
- st103_set_cntr (CNTR_CTRM | CNTR_RESETM);
-}
-
-void usb_lld_prepare_shutdown (void)
-{
- st103_set_istr (0);
- st103_set_cntr (0);
-}
-
-void usb_lld_shutdown (void)
-{
- st103_set_cntr (CNTR_PDWN);
- usb_lld_sys_shutdown ();
-}
-
-void
-usb_interrupt_handler (void)
-{
- uint16_t istr_value = st103_get_istr ();
-
- if ((istr_value & ISTR_RESET))
- {
- st103_set_istr (CLR_RESET);
- usb_cb_device_reset ();
- }
- else
- {
- if ((istr_value & ISTR_OVR))
- st103_set_istr (CLR_OVR);
-
- if ((istr_value & ISTR_ERR))
- st103_set_istr (CLR_ERR);
-
- if ((istr_value & ISTR_CTR))
- usb_handle_transfer (istr_value);
- }
-}
-
-static void handle_datastage_out (void)
-{
- if (data_p->addr && data_p->len)
- {
- uint32_t len = st103_get_rx_count (ENDP0);
-
- if (len > data_p->len)
- len = data_p->len;
-
- usb_lld_from_pmabuf (data_p->addr, st103_get_rx_addr (ENDP0), len);
- data_p->len -= len;
- data_p->addr += len;
- }
-
- if (data_p->len == 0)
- {
- dev_p->state = WAIT_STATUS_IN;
- st103_set_tx_count (ENDP0, 0);
- st103_ep_set_rxtx_status (ENDP0, EP_RX_STALL, EP_TX_VALID);
- }
- else
- {
- dev_p->state = OUT_DATA;
- st103_ep_set_rx_status (ENDP0, EP_RX_VALID);
- }
-}
-
-static void handle_datastage_in (void)
-{
- uint32_t len = USB_MAX_PACKET_SIZE;;
-
- if ((data_p->len == 0) && (dev_p->state == LAST_IN_DATA))
- {
- if (data_p->require_zlp)
- {
- data_p->require_zlp = 0;
-
- /* No more data to send. Send empty packet */
- st103_set_tx_count (ENDP0, 0);
- st103_ep_set_rxtx_status (ENDP0, EP_RX_VALID, EP_TX_VALID);
- }
- else
- {
- /* No more data to send, proceed to receive OUT acknowledge.*/
- dev_p->state = WAIT_STATUS_OUT;
- st103_ep_set_rxtx_status (ENDP0, EP_RX_VALID, EP_TX_STALL);
- }
-
- return;
- }
-
- dev_p->state = (data_p->len <= len) ? LAST_IN_DATA : IN_DATA;
-
- if (len > data_p->len)
- len = data_p->len;
-
- usb_lld_to_pmabuf (data_p->addr, st103_get_tx_addr (ENDP0), len);
- data_p->len -= len;
- data_p->addr += len;
- st103_set_tx_count (ENDP0, len);
- st103_ep_set_tx_status (ENDP0, EP_TX_VALID);
-}
-
-typedef int (*HANDLER) (uint8_t req, struct req_args *arg);
-
-static int std_none (uint8_t req, struct req_args *arg)
-{
- (void)req; (void)arg;
- return USB_UNSUPPORT;
-}
-
-static int std_get_status (uint8_t req, struct req_args *arg)
-{
- uint8_t rcp = req & RECIPIENT;
- uint16_t status_info = 0;
-
- if (arg->value != 0 || arg->len != 2 || (arg->index >> 8) != 0
- || USB_SETUP_SET (req))
- return USB_UNSUPPORT;
-
- if (rcp == DEVICE_RECIPIENT)
- {
- if (arg->index == 0)
- {
- /* Get Device Status */
- uint8_t feature = dev_p->current_feature;
-
- /* Remote Wakeup enabled */
- if ((feature & (1 << 5)))
- status_info |= 2;
- else
- status_info &= ~2;
-
- /* Bus-powered */
- if ((feature & (1 << 6)))
- status_info |= 1;
- else /* Self-powered */
- status_info &= ~1;
-
- return usb_lld_reply_request (&status_info, 2, arg);
- }
- }
- else if (rcp == INTERFACE_RECIPIENT)
- {
- int r;
-
- if (dev_p->current_configuration == 0)
- return USB_UNSUPPORT;
-
- r = usb_cb_interface (USB_QUERY_INTERFACE, arg);
- if (r != USB_SUCCESS)
- return USB_UNSUPPORT;
-
- return usb_lld_reply_request (&status_info, 2, arg);
- }
- else if (rcp == ENDPOINT_RECIPIENT)
- {
- uint8_t endpoint = (arg->index & 0x0f);
- uint16_t status;
-
- if ((arg->index & 0x70) || endpoint == ENDP0)
- return USB_UNSUPPORT;
-
- if ((arg->index & 0x80))
- {
- status = st103_ep_get_tx_status (endpoint);
- if (status == 0) /* Disabled */
- return USB_UNSUPPORT;
- else if (status == EP_TX_STALL)
- status_info |= 1; /* IN Endpoint stalled */
- }
- else
- {
- status = st103_ep_get_rx_status (endpoint);
- if (status == 0) /* Disabled */
- return USB_UNSUPPORT;
- else if (status == EP_RX_STALL)
- status_info |= 1; /* OUT Endpoint stalled */
- }
-
- return usb_lld_reply_request (&status_info, 2, arg);
- }
-
- return USB_UNSUPPORT;
-}
-
-static int std_clear_feature (uint8_t req, struct req_args *arg)
-{
- uint8_t rcp = req & RECIPIENT;
-
- if (USB_SETUP_GET (req))
- return USB_UNSUPPORT;
-
- if (rcp == DEVICE_RECIPIENT)
- {
- if (arg->len != 0 || arg->index != 0)
- return USB_UNSUPPORT;
-
- if (arg->value == DEVICE_REMOTE_WAKEUP)
- {
- dev_p->current_feature &= ~(1 << 5);
- return USB_SUCCESS;
- }
- }
- else if (rcp == ENDPOINT_RECIPIENT)
- {
- uint8_t endpoint = (arg->index & 0x0f);
- uint16_t status;
-
- if (dev_p->current_configuration == 0)
- return USB_UNSUPPORT;
-
- if (arg->len != 0 || (arg->index >> 8) != 0
- || arg->value != ENDPOINT_STALL || endpoint == ENDP0)
- return USB_UNSUPPORT;
-
- if ((arg->index & 0x80))
- status = st103_ep_get_tx_status (endpoint);
- else
- status = st103_ep_get_rx_status (endpoint);
-
- if (status == 0) /* Disabled */
- return USB_UNSUPPORT;
-
- if (arg->index & 0x80) /* IN endpoint */
- st103_ep_clear_dtog_tx (endpoint);
- else /* OUT endpoint */
- st103_ep_clear_dtog_rx (endpoint);
-
- // event??
- return USB_SUCCESS;
- }
-
- return USB_UNSUPPORT;
-}
-
-static int std_set_feature (uint8_t req, struct req_args *arg)
-{
- uint8_t rcp = req & RECIPIENT;
-
- if (USB_SETUP_GET (req))
- return USB_UNSUPPORT;
-
- if (rcp == DEVICE_RECIPIENT)
- {
- if (arg->len != 0 || arg->index != 0)
- return USB_UNSUPPORT;
-
- if (arg->value == DEVICE_REMOTE_WAKEUP)
- {
- dev_p->current_feature |= 1 << 5;
- // event??
- return USB_SUCCESS;
- }
- }
- else if (rcp == ENDPOINT_RECIPIENT)
- {
- uint8_t endpoint = (arg->index & 0x0f);
- uint32_t status;
-
- if (dev_p->current_configuration == 0)
- return USB_UNSUPPORT;
-
- if (arg->len != 0 || (arg->index >> 8) != 0
- || arg->value != 0 || endpoint == ENDP0)
- return USB_UNSUPPORT;
-
- if ((arg->index & 0x80))
- status = st103_ep_get_tx_status (endpoint);
- else
- status = st103_ep_get_rx_status (endpoint);
-
- if (status == 0) /* Disabled */
- return USB_UNSUPPORT;
-
- if (arg->index & 0x80)
- /* IN endpoint */
- st103_ep_set_tx_status (endpoint, EP_TX_STALL);
- else
- /* OUT endpoint */
- st103_ep_set_rx_status (endpoint, EP_RX_STALL);
-
- // event??
- return USB_SUCCESS;
- }
-
- return USB_UNSUPPORT;
-}
-
-static int std_set_address (uint8_t req, struct req_args *arg)
-{
- uint8_t rcp = req & RECIPIENT;
-
- if (USB_SETUP_GET (req))
- return USB_UNSUPPORT;
-
- if (rcp == DEVICE_RECIPIENT && arg->len == 0 && arg->value <= 127
- && arg->index == 0 && dev_p->current_configuration == 0)
- return USB_SUCCESS;
-
- return USB_UNSUPPORT;
-}
-
-static int std_get_descriptor (uint8_t req, struct req_args *arg)
-{
- uint8_t rcp = req & RECIPIENT;
-
- if (USB_SETUP_SET (req))
- return USB_UNSUPPORT;
-
- return usb_cb_get_descriptor (rcp, (arg->value >> 8),
- (arg->value & 0xff), arg);
-}
-
-static int std_get_configuration (uint8_t req, struct req_args *arg)
-{
- uint8_t rcp = req & RECIPIENT;
-
- if (USB_SETUP_SET (req))
- return USB_UNSUPPORT;
-
- if (rcp == DEVICE_RECIPIENT)
- return usb_lld_reply_request (&dev_p->current_configuration, 1, arg);
-
- return USB_UNSUPPORT;
-}
-
-static int std_set_configuration (uint8_t req, struct req_args *arg)
-{
- uint8_t rcp = req & RECIPIENT;
-
- if (USB_SETUP_GET (req))
- return USB_UNSUPPORT;
-
- if (rcp == DEVICE_RECIPIENT && arg->index == 0 && arg->len == 0)
- return usb_cb_handle_event (USB_EVENT_CONFIG, arg->value);
-
- return USB_UNSUPPORT;
-}
-
-static int std_get_interface (uint8_t req, struct req_args *arg)
-{
- uint8_t rcp = req & RECIPIENT;
-
- if (USB_SETUP_SET (req))
- return USB_UNSUPPORT;
-
- if (rcp == INTERFACE_RECIPIENT)
- {
- if (arg->value != 0 || (arg->index >> 8) != 0 || arg->len != 1)
- return USB_UNSUPPORT;
-
- if (dev_p->current_configuration == 0)
- return USB_UNSUPPORT;
-
- return usb_cb_interface (USB_GET_INTERFACE, arg);
- }
-
- return USB_UNSUPPORT;
-}
-
-static int std_set_interface (uint8_t req, struct req_args *arg)
-{
- uint8_t rcp = req & RECIPIENT;
-
- if (USB_SETUP_GET (req) || rcp != INTERFACE_RECIPIENT
- || arg->len != 0 || (arg->index >> 8) != 0
- || (arg->value >> 8) != 0 || dev_p->current_configuration == 0)
- return USB_UNSUPPORT;
-
- return usb_cb_interface (USB_SET_INTERFACE, arg);
-}
-
-
-static void handle_setup0 (void)
-{
- const uint16_t *pw;
- uint16_t w;
- uint8_t req_no;
- int r = USB_UNSUPPORT;
- HANDLER handler;
-
- pw = (uint16_t *)(PMA_ADDR + (uint8_t *)(st103_get_rx_addr (ENDP0) * 2));
- w = *pw++;
-
- dev_p->bmRequestType = w & 0xff;
- dev_p->bRequest = req_no = w >> 8;
- pw++;
- dev_p->value = *pw++;
- pw++;
- dev_p->index = *pw++;
- pw++;
- dev_p->len = *pw;
-
- data_p->addr = NULL;
- data_p->len = 0;
- data_p->require_zlp = 0;
-
- if ((dev_p->bmRequestType & REQUEST_TYPE) == STANDARD_REQUEST)
- {
- if (req_no < TOTAL_REQUEST)
- {
- switch (req_no)
- {
- case 0: handler = std_get_status; break;
- case 1: handler = std_clear_feature; break;
- case 3: handler = std_set_feature; break;
- case 5: handler = std_set_address; break;
- case 6: handler = std_get_descriptor; break;
- case 8: handler = std_get_configuration; break;
- case 9: handler = std_set_configuration; break;
- case 10: handler = std_get_interface; break;
- case 11: handler = std_set_interface; break;
- default: handler = std_none; break;
- }
-
- r = (*handler) (dev_p->bmRequestType,
- (struct req_args *)&dev_p->value);
- }
- }
- else
- r = usb_cb_setup (dev_p->bmRequestType, req_no,
- (struct req_args *)&dev_p->value);
-
- if (r != USB_SUCCESS)
- dev_p->state = STALLED;
- else
- {
- if (USB_SETUP_SET (dev_p->bmRequestType))
- {
- if (dev_p->len == 0)
- {
- dev_p->state = WAIT_STATUS_IN;
- st103_set_tx_count (ENDP0, 0);
- st103_ep_set_rxtx_status (ENDP0, EP_RX_STALL, EP_TX_VALID);
- }
- else
- {
- dev_p->state = OUT_DATA;
- st103_ep_set_rx_status (ENDP0, EP_RX_VALID);
- }
- }
- }
-}
-
-static void handle_in0 (void)
-{
- if (dev_p->state == IN_DATA || dev_p->state == LAST_IN_DATA)
- handle_datastage_in ();
- else if (dev_p->state == WAIT_STATUS_IN)
- {
- if ((dev_p->bRequest == SET_ADDRESS) &&
- ((dev_p->bmRequestType & (REQUEST_TYPE | RECIPIENT))
- == (STANDARD_REQUEST | DEVICE_RECIPIENT)))
- {
- st103_set_daddr (dev_p->value);
- usb_cb_handle_event (USB_EVENT_ADDRESS, dev_p->value);
- }
- else
- usb_cb_ctrl_write_finish (dev_p->bmRequestType, dev_p->bRequest,
- (struct req_args *)&dev_p->value);
-
- dev_p->state = STALLED;
- }
- else
- dev_p->state = STALLED;
-}
-
-static void handle_out0 (void)
-{
- if (dev_p->state == IN_DATA || dev_p->state == LAST_IN_DATA)
- /* host aborts the transfer before finish */
- dev_p->state = STALLED;
- else if (dev_p->state == OUT_DATA)
- handle_datastage_out ();
- else if (dev_p->state == WAIT_STATUS_OUT)
- dev_p->state = STALLED;
- /* Unexpect state, STALL the endpoint */
- else
- dev_p->state = STALLED;
-}
-
-static void
-usb_handle_transfer (uint16_t istr_value)
-{
- uint16_t ep_value = 0;
- uint8_t ep_index;
-
- ep_index = (istr_value & ISTR_EP_ID);
- /* Decode and service non control endpoints interrupt */
- /* process related endpoint register */
- ep_value = st103_get_epreg (ep_index);
-
- if (ep_index == 0)
- {
- if ((ep_value & EP_CTR_TX))
- {
- st103_ep_clear_ctr_tx (ep_index);
- handle_in0 ();
- }
-
- if ((ep_value & EP_CTR_RX))
- {
- st103_ep_clear_ctr_rx (ep_index);
-
- if ((ep_value & EP_SETUP))
- handle_setup0 ();
- else
- handle_out0 ();
- }
-
- if (dev_p->state == STALLED)
- st103_ep_set_rxtx_status (ENDP0, EP_RX_STALL, EP_TX_STALL);
- }
- else
- {
- if ((ep_value & EP_CTR_RX))
- {
- st103_ep_clear_ctr_rx (ep_index);
- usb_cb_rx_ready (ep_index);
- }
-
- if ((ep_value & EP_CTR_TX))
- {
- st103_ep_clear_ctr_tx (ep_index);
- usb_cb_tx_done (ep_index);
- }
- }
-}
-
-void usb_lld_reset (uint8_t feature)
-{
- usb_lld_set_configuration (0);
- dev_p->current_feature = feature;
- st103_set_btable ();
- st103_set_daddr (0);
-}
-
-void usb_lld_txcpy (const void *src,
- int ep_num, int offset, size_t len)
-{
- usb_lld_to_pmabuf (src, st103_get_tx_addr (ep_num) + offset, len);
-}
-
-void usb_lld_write (uint8_t ep_num, const void *buf, size_t len)
-{
- usb_lld_to_pmabuf (buf, st103_get_tx_addr (ep_num), len);
- st103_set_tx_count (ep_num, len);
- st103_ep_set_tx_status (ep_num, EP_TX_VALID);
-}
-
-void usb_lld_rxcpy (uint8_t *dst,
- int ep_num, int offset, size_t len)
-{
- usb_lld_from_pmabuf (dst, st103_get_rx_addr (ep_num) + offset, len);
-}
-
-void usb_lld_tx_enable (int ep_num, size_t len)
-{
- st103_set_tx_count (ep_num, len);
- st103_ep_set_tx_status (ep_num, EP_TX_VALID);
-}
-
-int usb_lld_tx_data_len (int ep_num)
-{
- return st103_get_tx_count (ep_num);
-}
-
-int usb_lld_rx_data_len (int ep_num)
-{
- return st103_get_rx_count (ep_num);
-}
-
-void usb_lld_stall_tx (int ep_num)
-{
- st103_ep_set_tx_status (ep_num, EP_TX_STALL);
-}
-
-void usb_lld_stall_rx (int ep_num)
-{
- st103_ep_set_rx_status (ep_num, EP_RX_STALL);
-}
-
-void usb_lld_rx_enable (int ep_num)
-{
- st103_ep_set_rx_status (ep_num, EP_RX_VALID);
-}
-
-void usb_lld_setup_endpoint (int ep_num, int ep_type, int ep_kind,
- int ep_rx_addr, int ep_tx_addr,
- int ep_rx_buf_size)
-{
- uint16_t epreg_value = st103_get_epreg (ep_num);
- uint16_t ep_rxtx_status = 0; /* Both disabled */
-
- /* Clear: Write 1 if 1: EP_DTOG_RX, EP_DTOG_TX */
- /* Set: Write: EP_T_FIELD, EP_KIND, EPADDR_FIELD */
- /* Set: Toggle: EPRX_STAT, EPTX_STAT */
- epreg_value &= (EPRX_STAT | EP_SETUP | EPTX_STAT | EP_DTOG_RX | EP_DTOG_TX);
-#if USB_KEEP_CORRECT_TRANSFER_FLAGS
- /* Keep: Write 1: EP_CTR_RX, EP_CTR_TX */
- epreg_value |= (EP_CTR_RX|EP_CTR_TX);
-#else
- /* Clear: Write 0: EP_CTR_RX, EP_CTR_TX */
-#endif
- epreg_value |= ep_type;
- epreg_value |= ep_kind;
- epreg_value |= ep_num;
-
- if (ep_rx_addr)
- {
- ep_rxtx_status |= EP_RX_VALID;
- st103_set_rx_addr (ep_num, ep_rx_addr);
- st103_set_rx_buf_size (ep_num, ep_rx_buf_size);
- }
-
- if (ep_tx_addr)
- {
- ep_rxtx_status |= EP_TX_NAK;
- st103_set_tx_addr (ep_num, ep_tx_addr);
- }
-
- epreg_value ^= (EPRX_DTOG1 & ep_rxtx_status);
- epreg_value ^= (EPRX_DTOG2 & ep_rxtx_status);
- epreg_value ^= (EPTX_DTOG1 & ep_rxtx_status);
- epreg_value ^= (EPTX_DTOG2 & ep_rxtx_status);
-
- st103_set_epreg (ep_num, epreg_value);
-}
-
-void usb_lld_set_configuration (uint8_t config)
-{
- dev_p->current_configuration = config;
-}
-
-uint8_t usb_lld_current_configuration (void)
-{
- return dev_p->current_configuration;
-}
-
-void usb_lld_set_data_to_recv (void *p, size_t len)
-{
- data_p->addr = p;
- data_p->len = len;
-}
-
-void usb_lld_to_pmabuf (const void *src, uint16_t addr, size_t n)
-{
- const uint8_t *s = (const uint8_t *)src;
- uint16_t *p;
- uint16_t w;
-
- if (n == 0)
- return;
-
- if ((addr & 1))
- {
- p = (uint16_t *)(PMA_ADDR + (addr - 1) * 2);
- w = *p;
- w = (w & 0xff) | (*s++) << 8;
- *p = w;
- p += 2;
- n--;
- }
- else
- p = (uint16_t *)(PMA_ADDR + addr * 2);
-
- while (n >= 2)
- {
- w = *s++;
- w |= (*s++) << 8;
- *p = w;
- p += 2;
- n -= 2;
- }
-
- if (n > 0)
- {
- w = *s;
- *p = w;
- }
-}
-
-void usb_lld_from_pmabuf (void *dst, uint16_t addr, size_t n)
-{
- uint8_t *d = (uint8_t *)dst;
- uint16_t *p;
- uint16_t w;
-
- if (n == 0)
- return;
-
- if ((addr & 1))
- {
- p = (uint16_t *)(PMA_ADDR + (addr - 1) * 2);
- w = *p;
- *d++ = (w >> 8);
- p += 2;
- n--;
- }
- else
- p = (uint16_t *)(PMA_ADDR + addr * 2);
-
- while (n >= 2)
- {
- w = *p;
- *d++ = (w & 0xff);
- *d++ = (w >> 8);
- p += 2;
- n -= 2;
- }
-
- if (n > 0)
- {
- w = *p;
- *d = (w & 0xff);
- }
-}
-
-
-/*
- * BUF: Pointer to data memory. Data memory should not be allocated
- * on stack when BUFLEN > USB_MAX_PACKET_SIZE.
- *
- * BUFLEN: size of the data.
- */
-int
-usb_lld_reply_request (const void *buf, size_t buflen, struct req_args *ctl)
-{
- uint32_t len_asked = ctl->len;
- uint32_t len;
-
- data_p->addr = (void *)buf;
- data_p->len = buflen;
-
- /* Restrict the data length to be the one host asks for */
- if (data_p->len > len_asked)
- data_p->len = len_asked;
-
- if (data_p->len != 0 && (data_p->len % USB_MAX_PACKET_SIZE) == 0)
- data_p->require_zlp = 1;
-
- if (data_p->len < USB_MAX_PACKET_SIZE)
- {
- len = data_p->len;
- dev_p->state = LAST_IN_DATA;
- }
- else
- {
- len = USB_MAX_PACKET_SIZE;
- dev_p->state = IN_DATA;
- }
-
- if (len)
- {
- usb_lld_to_pmabuf (data_p->addr, st103_get_tx_addr (ENDP0), len);
- data_p->len -= len;
- data_p->addr += len;
- }
-
- st103_set_tx_count (ENDP0, len);
- st103_ep_set_tx_status (ENDP0, EP_TX_VALID);
- return USB_SUCCESS;
-}
--
cgit v1.2.3