From bec96d03fae073c6fc10d1fc33d81b4e6423210c Mon Sep 17 00:00:00 2001 From: Edward Emelianov Date: Tue, 9 Feb 2021 22:47:26 +0300 Subject: [PATCH] change pl2303 snippet (add decimal input) --- F1-nolib/pl2303_snippet/Readme | 1 + F1-nolib/pl2303_snippet/hardware.c | 2 +- F1-nolib/pl2303_snippet/hardware.h | 2 +- F1-nolib/pl2303_snippet/main.c | 17 +- F1-nolib/pl2303_snippet/pl2303.bin | Bin 4044 -> 4800 bytes F1-nolib/pl2303_snippet/proto.c | 217 +++++++++-- F1-nolib/pl2303_snippet/proto.h | 9 +- F1-nolib/pl2303_snippet/usb.c | 30 +- F1-nolib/pl2303_snippet/usb.h | 8 +- F1-nolib/pl2303_snippet/usb_defs.h | 2 +- F1-nolib/pl2303_snippet/usb_lib.c | 2 +- F1-nolib/pl2303_snippet/usb_lib.h | 2 +- F1-nolib/pl2303_snippet_naked/Makefile | 139 +++++++ F1-nolib/pl2303_snippet_naked/Readme | 1 + F1-nolib/pl2303_snippet_naked/hardware.c | 48 +++ F1-nolib/pl2303_snippet_naked/hardware.h | 42 ++ F1-nolib/pl2303_snippet_naked/main.c | 84 ++++ F1-nolib/pl2303_snippet_naked/pl2303.bin | Bin 0 -> 4044 bytes F1-nolib/pl2303_snippet_naked/proto.c | 49 +++ F1-nolib/pl2303_snippet_naked/proto.h | 24 ++ F1-nolib/pl2303_snippet_naked/usb.c | 159 ++++++++ F1-nolib/pl2303_snippet_naked/usb.h | 33 ++ F1-nolib/pl2303_snippet_naked/usb_defs.h | 102 +++++ F1-nolib/pl2303_snippet_naked/usb_lib.c | 476 +++++++++++++++++++++++ F1-nolib/pl2303_snippet_naked/usb_lib.h | 184 +++++++++ 25 files changed, 1581 insertions(+), 52 deletions(-) create mode 100644 F1-nolib/pl2303_snippet_naked/Makefile create mode 100644 F1-nolib/pl2303_snippet_naked/Readme create mode 100644 F1-nolib/pl2303_snippet_naked/hardware.c create mode 100644 F1-nolib/pl2303_snippet_naked/hardware.h create mode 100644 F1-nolib/pl2303_snippet_naked/main.c create mode 100755 F1-nolib/pl2303_snippet_naked/pl2303.bin create mode 100644 F1-nolib/pl2303_snippet_naked/proto.c create mode 100644 F1-nolib/pl2303_snippet_naked/proto.h create mode 100644 F1-nolib/pl2303_snippet_naked/usb.c create mode 100644 F1-nolib/pl2303_snippet_naked/usb.h create mode 100644 F1-nolib/pl2303_snippet_naked/usb_defs.h create mode 100644 F1-nolib/pl2303_snippet_naked/usb_lib.c create mode 100644 F1-nolib/pl2303_snippet_naked/usb_lib.h diff --git a/F1-nolib/pl2303_snippet/Readme b/F1-nolib/pl2303_snippet/Readme index f52cfc1..208a1bf 100644 --- a/F1-nolib/pl2303_snippet/Readme +++ b/F1-nolib/pl2303_snippet/Readme @@ -1 +1,2 @@ Base USB-CDC snippet with PL2303 emulation +With functions of integer read & decimal print. \ No newline at end of file diff --git a/F1-nolib/pl2303_snippet/hardware.c b/F1-nolib/pl2303_snippet/hardware.c index a9810a9..103ffb3 100644 --- a/F1-nolib/pl2303_snippet/hardware.c +++ b/F1-nolib/pl2303_snippet/hardware.c @@ -1,5 +1,5 @@ /* - * This file is part of the pl2303 project. + * This file is part of the si7005 project. * Copyright 2020 Edward V. Emelianov . * * This program is free software: you can redistribute it and/or modify diff --git a/F1-nolib/pl2303_snippet/hardware.h b/F1-nolib/pl2303_snippet/hardware.h index cce8dfe..603369b 100644 --- a/F1-nolib/pl2303_snippet/hardware.h +++ b/F1-nolib/pl2303_snippet/hardware.h @@ -1,5 +1,5 @@ /* - * This file is part of the pl2303 project. + * This file is part of the si7005 project. * Copyright 2020 Edward V. Emelianov . * * This program is free software: you can redistribute it and/or modify diff --git a/F1-nolib/pl2303_snippet/main.c b/F1-nolib/pl2303_snippet/main.c index 019ca60..6ab5a11 100644 --- a/F1-nolib/pl2303_snippet/main.c +++ b/F1-nolib/pl2303_snippet/main.c @@ -1,5 +1,5 @@ /* - * This file is part of the pl2303 project. + * This file is part of the si7005 project. * Copyright 2020 Edward V. Emelianov . * * This program is free software: you can redistribute it and/or modify @@ -21,6 +21,8 @@ #include "usb.h" #include "usb_lib.h" +#define USBBUFSZ 127 + volatile uint32_t Tms = 0; /* Called when systick fires */ @@ -30,20 +32,21 @@ void sys_tick_handler(void){ // usb getline char *get_USB(){ - static char tmpbuf[512], *curptr = tmpbuf; - static int rest = 511; - uint8_t x = USB_receive((uint8_t*)curptr); + static char tmpbuf[USBBUFSZ+1], *curptr = tmpbuf; + static int rest = USBBUFSZ; + int x = USB_receive(curptr); curptr[x] = 0; if(!x) return NULL; if(curptr[x-1] == '\n'){ curptr = tmpbuf; - rest = 511; + rest = USBBUFSZ; return tmpbuf; } curptr += x; rest -= x; if(rest <= 0){ // buffer overflow curptr = tmpbuf; - rest = 511; + rest = USBBUFSZ; + USB_send("USB buffer overflow\n"); } return NULL; } @@ -76,7 +79,7 @@ int main(void){ if(ans){ uint16_t l = 0; char *p = ans; while(*p++) l++; - USB_send((uint8_t*)ans, l); + USB_send(ans); } } } diff --git a/F1-nolib/pl2303_snippet/pl2303.bin b/F1-nolib/pl2303_snippet/pl2303.bin index 18dee95210bb747b89a133e6be4eeea5417d1618..11812a833b62bbb77d0bf054325f8bc7d1594bfa 100755 GIT binary patch delta 2241 zcmb_deN0=|6+ibq8*BrP0~s*}!o>z^c!n5g6^;V^*D4-*1ov2^7ON6`6(i^8FUcE_KDR-&BLBL6q(UUF$8y1Jt)s zSL{<@-0$@dRt4vl_A7)`NzVk`^0Si2D6JHf; zhxf?e<2#$4M{8vP>>nk5qrwa*zg5BhL4p@6R3bpjb`q4mTYt>R8$7+&3_eP_>jX{8 zq>>)?w6z}YQ(otzS`h?L=4YtDiQIZanhMqwHmL`Md~#QGG3Vs<0^FIMF^ORF`1tG` zugQ9NWbrw>akWU_)|7hF&82e5#~goO4=FK^T`ZB5x59l+VNdcKNxB=iDXI2T8m5UdAsBAO-1Qu|(*(7e~?{ynCbF z!AkJ`)x)zQbZZ`k@T4ubK8vw`O0e``GhrcbWaMa!>!?`4luf3zcJD%NOtWiU>)4e# z+)$~6eG6F)znJ8+MU|{G-sOdyQ=@k*D-QawHFH|Hw3Z%|W)* zTSGspoP&|1dI=5mF+7f$k{mHyt1m*EO z&_sq@u=H1ZFT2faX7O643Rhe6YoGXDFb|l$?*zGxw7NGX`gD*AS#j#KmpC z{+fs!uBKi?<8`2us z(*ExH_3KWiTaDfe5qiZeepYt4&-6MG4MTj+0Fd5^SxJ4z?{!>umVXro$JwcG#_1r4r_);sT|i-?|ThR@MUnRtL7nF^w6u>4( zS!_|70KJH*mJs2U)?2EFi}uxYiybS_2IRYbuP!Z>n?QJ{=~1w1B$w z=S;om64B}@Y`(bmSs|D17s3j1uF~PTB}bGvYS%f3Em=Dl0~^fq^*Sq|p!{+RtQPN1 z5o9X5Y@jS{fo=C-m53hHWd-Hp7H<>6{E{D5943@e!JN2u$FbLmLi>Pxn#&1 z<&*+%z}e}F6OqFbL)+d@Uzmb=?chs6!8NzxIw(u^;jTF2cnwyL7PpY16h5mU|3G)O z)`)Z}f)_P|rr?X;ng6O;IzMyaIkSjkD4)`wM zK6Ut#dN;$43%fhmeRL7|nEVJizHrb@{inyr0}&cJ6NrqT44uXE0&qAInmj=#PoMG! zBFr!_IUP6=h;(-R%T3N0>&Kr7ou(%y&IF#I01i4G4A4kmYMO?|>C|*&V)6vDKQi(N zZAJUo@%x0-emro@L7mZHAc`V%Y}!Hn{)x$EIyQNnP6b0}>BKahn55`7acb?keBZg}owMBhNz)XhK)hH5!Ue=L`vChs7Q?`b;;T9SHfwR4?-b@e1owC z>1VUXLv3hQU5|k{u+?N6&|zXip3p|QBV<&&%ym`{ z$iDO(|HQqNc8hz8v};X#YbP<`s7=J!$Kwy*4Ta@!@_2kidC3T-g7NE$M;UzfcrvC> zUm6^19R>Xd!`!x*16vU5p>I-ue?Xh%+uD^KbK7G==)2M#1ExVgYC!0IiKu1uvBu`_0jyYHw?dn@CWxSI zTI)}HIS^qOBqQ%h*lAFGdI?_}tV=f0HsukSTOp5~R=85L3MY3;5G0frgBj4zYcboY zDx7B#T0lD6RSgMVd)YQJ z=~VZbtQ6JDej38t7fnJTn<*65GLpIdd@<8w={2_}O$fGSHdYfn{y;3V0fA-8_3B=B zGwY;v{Z@KHy|vlNU++5db!W8x3o>B|5LHRE@k=fmEH}g<2y?t& z2oMqUo4XM3%5DmpNTnd?Qwun>b#X7n5K#(%{`M}90{lWt!7ck#2xAiizCZj!_zs9{ zmYj(I-ajZgWUmS*)=SWA@8iWrZ1VVCGnO`tub#Aka0l@Y;;-UZ^I1na@`q$XJ!&Y6 zOsy)Xo4kF=Lpur_);GB)Kb*Y;ertR=cP$-}X11h3P4Q>gZZIM*xA=Z#m{_~8n@fE_;;MreB}*&`gh0D>z=@#<|6I=a1x3RvAlF(1HRI%d(*F zLd(aed-Pq(0bf{&2TRqW;<^Z00I)gZ9L%o{|?h~k9Pn7 diff --git a/F1-nolib/pl2303_snippet/proto.c b/F1-nolib/pl2303_snippet/proto.c index 5c7a9c2..4275eb7 100644 --- a/F1-nolib/pl2303_snippet/proto.c +++ b/F1-nolib/pl2303_snippet/proto.c @@ -1,5 +1,5 @@ /* - * This file is part of the pl2303 project. + * This file is part of the si7005 project. * Copyright 2020 Edward V. Emelianov . * * This program is free software: you can redistribute it and/or modify @@ -19,31 +19,200 @@ #include "proto.h" #include "usb.h" -#define USND(str) do{USB_send((uint8_t*)str, sizeof(str)-1);}while(0) +char *omit_spaces(const char *buf){ + while(*buf){ + if(*buf > ' ') break; + ++buf; + } + return (char*)buf; +} + +// In case of overflow return `buf` and N==0xffffffff +// read decimal number & return pointer to next non-number symbol +static char *getdec(const char *buf, uint32_t *N){ + char *start = (char*)buf; + uint32_t num = 0; + while(*buf){ + char c = *buf; + if(c < '0' || c > '9'){ + break; + } + if(num > 429496729 || (num == 429496729 && c > '5')){ // overflow + *N = 0xffffff; + return start; + } + num *= 10; + num += c - '0'; + ++buf; + } + *N = num; + return (char*)buf; +} +// read hexadecimal number (without 0x prefix!) +static char *gethex(const char *buf, uint32_t *N){ + char *start = (char*)buf; + uint32_t num = 0; + while(*buf){ + char c = *buf; + uint8_t M = 0; + if(c >= '0' && c <= '9'){ + M = '0'; + }else if(c >= 'A' && c <= 'F'){ + M = 'A' - 10; + }else if(c >= 'a' && c <= 'f'){ + M = 'a' - 10; + } + if(M){ + if(num & 0xf0000000){ // overflow + *N = 0xffffff; + return start; + } + num <<= 4; + num += c - M; + }else{ + break; + } + ++buf; + } + *N = num; + return (char*)buf; +} +// read octal number (without 0 prefix!) +static char *getoct(const char *buf, uint32_t *N){ + char *start = (char*)buf; + uint32_t num = 0; + while(*buf){ + char c = *buf; + if(c < '0' || c > '7'){ + break; + } + if(num & 0xe0000000){ // overflow + *N = 0xffffff; + return start; + } + num <<= 3; + num += c - '0'; + ++buf; + } + *N = num; + return (char*)buf; +} +// read binary number (without b prefix!) +static char *getbin(const char *buf, uint32_t *N){ + char *start = (char*)buf; + uint32_t num = 0; + while(*buf){ + char c = *buf; + if(c < '0' || c > '1'){ + break; + } + if(num & 0x80000000){ // overflow + *N = 0xffffff; + return start; + } + num <<= 1; + if(c == '1') num |= 1; + ++buf; + } + *N = num; + return (char*)buf; +} + +/** + * @brief getnum - read uint32_t from string (dec, hex or bin: 127, 0x7f, 0b1111111) + * @param buf - buffer with number and so on + * @param N - the number read + * @return pointer to first non-number symbol in buf + * (if it is == buf, there's no number or if *N==0xffffffff there was overflow) + */ +char *getnum(const char *txt, uint32_t *N){ + char *nxt = NULL; + char *s = omit_spaces(txt); + if(*s == '0'){ // hex, oct or 0 + if(s[1] == 'x' || s[1] == 'X'){ // hex + nxt = gethex(s+2, N); + if(nxt == s+2) nxt = (char*)txt; + }else if(s[1] > '0'-1 && s[1] < '8'){ // oct + nxt = getoct(s+1, N); + if(nxt == s+1) nxt = (char*)txt; + }else{ // 0 + nxt = s+1; + *N = 0; + } + }else if(*s == 'b' || *s == 'B'){ + nxt = getbin(s+1, N); + if(nxt == s+1) nxt = (char*)txt; + }else{ + nxt = getdec(s, N); + if(nxt == s) nxt = (char*)txt; + } + return nxt; +} + +const char* helpmsg = + "'N' - read number (dec, 0xhex, 0oct, bbin) and show it in decimal\n" + "'R' - software reset\n" + "'W' - test watchdog\n" +; + const char *parse_cmd(const char *buf){ - if(buf[1] != '\n') return buf; - switch(*buf){ - /*case 'p': - pin_toggle(USBPU_port, USBPU_pin); - USND("USB pullup is "); - if(pin_read(USBPU_port, USBPU_pin)) USND("off\n"); - else USND("on\n"); - return NULL; - break;*/ - case 'R': - USND("Soft reset\n"); - NVIC_SystemReset(); - break; - case 'W': - USND("Wait for reboot\n"); - while(1){nop();}; - break; - default: // help - return - "'R' - software reset\n" - "'W' - test watchdog\n" - ; + if(buf[1] == '\n'){ // one symbol commands + switch(*buf){ + /*case 'p': + pin_toggle(USBPU_port, USBPU_pin); + USB_send("USB pullup is "); + if(pin_read(USBPU_port, USBPU_pin)) USND("off\n"); + else USB_send("on\n"); + return NULL; + break;*/ + case 'R': + USB_send("Soft reset\n"); + NVIC_SystemReset(); + break; + case 'W': + USB_send("Wait for reboot\n"); + while(1){nop();}; + break; + default: + return helpmsg; + } + return NULL; + } + uint32_t Num = 0; + char *nxt; + switch(*buf){ // long messages + case 'N': + ++buf; + nxt = getnum(buf, &Num); + if(buf == nxt){ + if(Num == 0) return "Wrong number\n"; + return "Integer32 overflow\n"; + } + USB_send("You give: "); + USB_send(u2str(Num)); + if(*nxt && *nxt != '\n'){ + USB_send(", the rest of string: "); + USB_send(nxt); + }else USB_send("\n"); break; + default: + return buf; } return NULL; } + +// return string with number `val` +char *u2str(uint32_t val){ + static char strbuf[11]; + char *bufptr = &strbuf[10]; + *bufptr = 0; + if(!val){ + *(--bufptr) = '0'; + }else{ + while(val){ + *(--bufptr) = val % 10 + '0'; + val /= 10; + } + } + return bufptr; +} diff --git a/F1-nolib/pl2303_snippet/proto.h b/F1-nolib/pl2303_snippet/proto.h index 276f146..e272138 100644 --- a/F1-nolib/pl2303_snippet/proto.h +++ b/F1-nolib/pl2303_snippet/proto.h @@ -1,5 +1,5 @@ /* - * This file is part of the pl2303 project. + * This file is part of the si7005 project. * Copyright 2020 Edward V. Emelianov . * * This program is free software: you can redistribute it and/or modify @@ -19,6 +19,13 @@ #ifndef PROTO_H__ #define PROTO_H__ +#include + const char *parse_cmd(const char *buf); +void printu(uint32_t val); +void printuhex(uint32_t val); +char *omit_spaces(const char *buf); +char *getnum(const char *buf, uint32_t *N); +char *u2str(uint32_t val); #endif // PROTO_H__ diff --git a/F1-nolib/pl2303_snippet/usb.c b/F1-nolib/pl2303_snippet/usb.c index 8dc8daf..79d7540 100644 --- a/F1-nolib/pl2303_snippet/usb.c +++ b/F1-nolib/pl2303_snippet/usb.c @@ -1,5 +1,5 @@ /* - * This file is part of the pl2303 project. + * This file is part of the si7005 project. * Copyright 2020 Edward V. Emelianov . * * This program is free software: you can redistribute it and/or modify @@ -22,6 +22,13 @@ static volatile uint8_t tx_succesfull = 1; static volatile uint8_t rxNE = 0; +static int sstrlen(const char *s){ + if(!s) return 0; + int l = 0; + while(*s++) ++l; + return l; +} + // interrupt IN handler (never used?) static void EP1_Handler(){ uint16_t epstatus = KEEP_DTOG(USB->EPnR[1]); @@ -61,13 +68,13 @@ void USB_setup(){ NVIC_EnableIRQ(USB_LP_CAN1_RX0_IRQn); } -static int usbwr(const uint8_t *buf, uint16_t l){ +static int usbwr(const char *buf, int l){ uint32_t ctra = 1000000; while(--ctra && tx_succesfull == 0){ IWDG->KR = IWDG_REFRESH; } tx_succesfull = 0; - EP_Write(3, buf, l); + EP_Write(3, (uint8_t*)buf, l); ctra = 1000000; while(--ctra && tx_succesfull == 0){ IWDG->KR = IWDG_REFRESH; @@ -76,19 +83,20 @@ static int usbwr(const uint8_t *buf, uint16_t l){ return 0; } -static uint8_t usbbuff[USB_TXBUFSZ-1]; // temporary buffer (63 - to prevent need of ZLP) -static uint8_t buflen = 0; // amount of symbols in usbbuff +static char usbbuff[USB_TXBUFSZ-1]; // temporary buffer (63 - to prevent need of ZLP) +static int buflen = 0; // amount of symbols in usbbuff // send next up to 63 bytes of data in usbbuff static void send_next(){ if(!buflen || !tx_succesfull) return; tx_succesfull = 0; - EP_Write(3, usbbuff, buflen); + EP_Write(3, (uint8_t*)usbbuff, buflen); buflen = 0; } // unblocking sending - just fill a buffer -void USB_send(const uint8_t *buf, uint16_t len){ +void USB_send(const char *buf){ + int len = sstrlen(buf); if(!usbON || !len) return; if(len > USB_TXBUFSZ-1 - buflen){ usbwr(usbbuff, buflen); @@ -102,7 +110,7 @@ void USB_send(const uint8_t *buf, uint16_t len){ } // blocking sending -void USB_send_blk(const uint8_t *buf, uint16_t len){ +void USB_send_blk(const char *buf, int len){ if(!usbON || !len) return; // USB disconnected if(buflen){ usbwr(usbbuff, buflen); @@ -111,7 +119,7 @@ void USB_send_blk(const uint8_t *buf, uint16_t len){ int needzlp = 0; while(len){ if(len == USB_TXBUFSZ) needzlp = 1; - uint16_t s = (len > USB_TXBUFSZ) ? USB_TXBUFSZ : len; + int s = (len > USB_TXBUFSZ) ? USB_TXBUFSZ : len; if(usbwr(buf, s)) return; len -= s; buf += s; @@ -148,9 +156,9 @@ void usb_proc(){ * @param buf (i) - buffer[64] for received data * @return amount of received bytes */ -uint8_t USB_receive(uint8_t *buf){ +int USB_receive(char *buf){ if(!usbON || !rxNE) return 0; - uint8_t sz = EP_Read(2, (uint16_t*)buf); + int sz = EP_Read(2, (uint16_t*)buf); uint16_t epstatus = KEEP_DTOG(USB->EPnR[2]); // keep stat_tx & set ACK rx USB->EPnR[2] = (epstatus & ~(USB_EPnR_STAT_TX)) ^ USB_EPnR_STAT_RX; diff --git a/F1-nolib/pl2303_snippet/usb.h b/F1-nolib/pl2303_snippet/usb.h index b1a8333..b03aab3 100644 --- a/F1-nolib/pl2303_snippet/usb.h +++ b/F1-nolib/pl2303_snippet/usb.h @@ -1,5 +1,5 @@ /* - * This file is part of the pl2303 project. + * This file is part of the si7005 project. * Copyright 2020 Edward V. Emelianov . * * This program is free software: you can redistribute it and/or modify @@ -26,8 +26,8 @@ void USB_setup(); void usb_proc(); -void USB_send(const uint8_t *buf, uint16_t len); -void USB_send_blk(const uint8_t *buf, uint16_t len); -uint8_t USB_receive(uint8_t *buf); +void USB_send(const char *buf); +void USB_send_blk(const char *buf, int len); +int USB_receive(char *buf); #endif // __USB_H__ diff --git a/F1-nolib/pl2303_snippet/usb_defs.h b/F1-nolib/pl2303_snippet/usb_defs.h index 6a798c0..3aa437f 100644 --- a/F1-nolib/pl2303_snippet/usb_defs.h +++ b/F1-nolib/pl2303_snippet/usb_defs.h @@ -1,5 +1,5 @@ /* - * This file is part of the pl2303 project. + * This file is part of the si7005 project. * Copyright 2020 Edward V. Emelianov . * * This program is free software: you can redistribute it and/or modify diff --git a/F1-nolib/pl2303_snippet/usb_lib.c b/F1-nolib/pl2303_snippet/usb_lib.c index 1fba3c0..4e3d36e 100644 --- a/F1-nolib/pl2303_snippet/usb_lib.c +++ b/F1-nolib/pl2303_snippet/usb_lib.c @@ -1,5 +1,5 @@ /* - * This file is part of the pl2303 project. + * This file is part of the si7005 project. * Copyright 2020 Edward V. Emelianov . * * This program is free software: you can redistribute it and/or modify diff --git a/F1-nolib/pl2303_snippet/usb_lib.h b/F1-nolib/pl2303_snippet/usb_lib.h index 5070704..a2d33d5 100644 --- a/F1-nolib/pl2303_snippet/usb_lib.h +++ b/F1-nolib/pl2303_snippet/usb_lib.h @@ -1,5 +1,5 @@ /* - * This file is part of the pl2303 project. + * This file is part of the si7005 project. * Copyright 2020 Edward V. Emelianov . * * This program is free software: you can redistribute it and/or modify diff --git a/F1-nolib/pl2303_snippet_naked/Makefile b/F1-nolib/pl2303_snippet_naked/Makefile new file mode 100644 index 0000000..c243bd9 --- /dev/null +++ b/F1-nolib/pl2303_snippet_naked/Makefile @@ -0,0 +1,139 @@ +BINARY = pl2303 +BOOTPORT ?= /dev/ttyUSB0 +BOOTSPEED ?= 115200 +# MCU FAMILY +FAMILY ?= F1 +# MCU code +MCU ?= F103x8 +# density (stm32f10x.h, lines 70-84) +DENSITY ?= MD +# change this linking script depending on particular MCU model, +LDSCRIPT ?= stm32f103x8.ld +# debug +#DEFS = -DEBUG + +INDEPENDENT_HEADERS= + +FP_FLAGS ?= -msoft-float -mfloat-abi=soft +ASM_FLAGS ?= -mthumb -mcpu=cortex-m3 -mfix-cortex-m3-ldrd +ARCH_FLAGS = $(ASM_FLAGS) $(FP_FLAGS) + +############################################################################### +# Executables +#PREFIX ?= arm-none-eabi +# gcc from arm web site +PREFIX ?= /opt/bin/arm-none-eabi +TOOLCHLIB ?= /opt/arm-none-eabi/lib +RM := rm -f +RMDIR := rmdir +CC := $(PREFIX)-gcc +# don't replace ld with gcc: the binary size would be much greater!! +LD := $(PREFIX)-ld +AR := $(PREFIX)-ar +AS := $(PREFIX)-as +SIZE := $(PREFIX)-size +OBJCOPY := $(PREFIX)-objcopy +OBJDUMP := $(PREFIX)-objdump +GDB := $(PREFIX)-gdb +STFLASH := $(shell which st-flash) +STBOOT := $(shell which stm32flash) +DFUUTIL := $(shell which dfu-util) + +############################################################################### +# Source files +OBJDIR = mk +SRC := $(wildcard *.c) +OBJS := $(addprefix $(OBJDIR)/, $(SRC:%.c=%.o)) +STARTUP = $(OBJDIR)/startup.o +OBJS += $(STARTUP) +# dependencies: we need them to recompile files if their headers-dependencies changed +DEPS := $(OBJS:.o=.d) + +INC_DIR ?= ../inc + +INCLUDE := -I$(INC_DIR)/Fx -I$(INC_DIR)/cm +LIB_DIR := $(INC_DIR)/ld + +############################################################################### +# C flags +CFLAGS += -O2 -g -D__thumb2__=1 -MD +CFLAGS += -Wall -Werror -Wextra -Wshadow +CFLAGS += -fno-common -ffunction-sections -fdata-sections -fno-stack-protector +CFLAGS += $(ARCH_FLAGS) + +############################################################################### +# Linker flags +LDFLAGS += -nostartfiles --static -nostdlibs +LDFLAGS += -L$(LIB_DIR) -L$(TOOLCHLIB) +LDFLAGS += -T$(LDSCRIPT) + +############################################################################### +# Used libraries +LDLIBS += -lc $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) + +DEFS += -DSTM32$(FAMILY) -DSTM32$(MCU) -DSTM32F10X_$(DENSITY) + +ELF := $(OBJDIR)/$(BINARY).elf +LIST := $(OBJDIR)/$(BINARY).list +BIN := $(BINARY).bin +HEX := $(BINARY).hex + +all: bin list size + +elf: $(ELF) +bin: $(BIN) +hex: $(HEX) +list: $(LIST) + +ifneq ($(MAKECMDGOALS),clean) +-include $(DEPS) +endif + +$(OBJDIR): + mkdir $(OBJDIR) + +$(STARTUP): $(INC_DIR)/startup/vector.c + $(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -o $@ -c $< + +$(OBJDIR)/%.o: %.c + @echo " CC $<" + $(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -o $@ -c $< + +$(BIN): $(ELF) + @echo " OBJCOPY $(BIN)" + $(OBJCOPY) -Obinary $(ELF) $(BIN) + +$(HEX): $(ELF) + @echo " OBJCOPY $(HEX)" + $(OBJCOPY) -Oihex $(ELF) $(HEX) + +$(LIST): $(ELF) + @echo " OBJDUMP $(LIST)" + $(OBJDUMP) -S $(ELF) > $(LIST) + +$(ELF): $(OBJDIR) $(OBJS) + @echo " LD $(ELF)" + $(LD) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $(ELF) + +size: $(ELF) + $(SIZE) $(ELF) + +clean: + @echo " CLEAN" + $(RM) $(OBJS) $(DEPS) $(ELF) $(HEX) $(LIST) + @rmdir $(OBJDIR) 2>/dev/null || true + + +flash: $(BIN) + @echo " FLASH $(BIN)" + $(STFLASH) write $(BIN) 0x8000000 + +boot: $(BIN) + @echo " LOAD $(BIN) through bootloader" + $(STBOOT) -b$(BOOTSPEED) $(BOOTPORT) -w $(BIN) + +dfuboot: $(BIN) + @echo " LOAD $(BIN) THROUGH DFU" + $(DFUUTIL) -a0 -D $(BIN) -s 0x08000000 + +.PHONY: clean flash boot diff --git a/F1-nolib/pl2303_snippet_naked/Readme b/F1-nolib/pl2303_snippet_naked/Readme new file mode 100644 index 0000000..f52cfc1 --- /dev/null +++ b/F1-nolib/pl2303_snippet_naked/Readme @@ -0,0 +1 @@ +Base USB-CDC snippet with PL2303 emulation diff --git a/F1-nolib/pl2303_snippet_naked/hardware.c b/F1-nolib/pl2303_snippet_naked/hardware.c new file mode 100644 index 0000000..a9810a9 --- /dev/null +++ b/F1-nolib/pl2303_snippet_naked/hardware.c @@ -0,0 +1,48 @@ +/* + * This file is part of the pl2303 project. + * Copyright 2020 Edward V. Emelianov . + * + * 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 3 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, see . + */ + +#include "hardware.h" + +static inline void gpio_setup(){ + // Enable clocks to the GPIO subsystems (PB for ADC), turn on AFIO clocking to disable SWD/JTAG + RCC->APB2ENR |= RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPCEN | RCC_APB2ENR_AFIOEN; + // turn off SWJ/JTAG +// AFIO->MAPR = AFIO_MAPR_SWJ_CFG_DISABLE; + AFIO->MAPR = AFIO_MAPR_SWJ_CFG_JTAGDISABLE; // for PA15 + // Set led as opendrain output + GPIOC->CRH |= CRH(13, CNF_ODOUTPUT|MODE_SLOW); + // USB pullup (PA15) - pushpull output + GPIOA->CRH = CRH(15, CNF_PPOUTPUT|MODE_SLOW); +} + +void hw_setup(){ + gpio_setup(); +} + +void iwdg_setup(){ + uint32_t tmout = 16000000; + RCC->CSR |= RCC_CSR_LSION; + while((RCC->CSR & RCC_CSR_LSIRDY) != RCC_CSR_LSIRDY){if(--tmout == 0) break;} /* (2) */ + IWDG->KR = IWDG_START; + IWDG->KR = IWDG_WRITE_ACCESS; + IWDG->PR = IWDG_PR_PR_1; + IWDG->RLR = 1250; + tmout = 16000000; + while(IWDG->SR){if(--tmout == 0) break;} + IWDG->KR = IWDG_REFRESH; +} diff --git a/F1-nolib/pl2303_snippet_naked/hardware.h b/F1-nolib/pl2303_snippet_naked/hardware.h new file mode 100644 index 0000000..cce8dfe --- /dev/null +++ b/F1-nolib/pl2303_snippet_naked/hardware.h @@ -0,0 +1,42 @@ +/* + * This file is part of the pl2303 project. + * Copyright 2020 Edward V. Emelianov . + * + * 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 3 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, see . + */ + +#pragma once +#ifndef __HARDWARE_H__ +#define __HARDWARE_H__ + +#include "stm32f1.h" + +// LED0 - PC13 (bluepill), blinking each second +#define LED0_port GPIOC +#define LED0_pin (1<<13) + +// USB pullup (not present in bluepill, should be soldered) - PA15 +#define USBPU_port GPIOA +#define USBPU_pin (1<<15) +#define USBPU_ON() pin_set(USBPU_port, USBPU_pin) +#define USBPU_OFF() pin_clear(USBPU_port, USBPU_pin) + +#define LED_blink(x) pin_toggle(x ## _port, x ## _pin) +#define LED_on(x) pin_clear(x ## _port, x ## _pin) +#define LED_off(x) pin_set(x ## _port, x ## _pin) + +void hw_setup(); +void iwdg_setup(); + +#endif // __HARDWARE_H__ diff --git a/F1-nolib/pl2303_snippet_naked/main.c b/F1-nolib/pl2303_snippet_naked/main.c new file mode 100644 index 0000000..019ca60 --- /dev/null +++ b/F1-nolib/pl2303_snippet_naked/main.c @@ -0,0 +1,84 @@ +/* + * This file is part of the pl2303 project. + * Copyright 2020 Edward V. Emelianov . + * + * 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 3 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, see . + */ + +#include "hardware.h" +#include "proto.h" +#include "usb.h" +#include "usb_lib.h" + +volatile uint32_t Tms = 0; + +/* Called when systick fires */ +void sys_tick_handler(void){ + ++Tms; +} + +// usb getline +char *get_USB(){ + static char tmpbuf[512], *curptr = tmpbuf; + static int rest = 511; + uint8_t x = USB_receive((uint8_t*)curptr); + curptr[x] = 0; + if(!x) return NULL; + if(curptr[x-1] == '\n'){ + curptr = tmpbuf; + rest = 511; + return tmpbuf; + } + curptr += x; rest -= x; + if(rest <= 0){ // buffer overflow + curptr = tmpbuf; + rest = 511; + } + return NULL; +} + +int main(void){ + uint32_t lastT = 0; + sysreset(); + StartHSE(); + hw_setup(); + SysTick_Config(72000); + + RCC->CSR |= RCC_CSR_RMVF; // remove reset flags + + USBPU_OFF(); + USB_setup(); + iwdg_setup(); + USBPU_ON(); + + while (1){ + IWDG->KR = IWDG_REFRESH; // refresh watchdog + if(lastT > Tms || Tms - lastT > 499){ + LED_blink(LED0); + lastT = Tms; + } + usb_proc(); + char *txt, *ans; + if((txt = get_USB())){ + IWDG->KR = IWDG_REFRESH; + ans = (char*)parse_cmd(txt); + if(ans){ + uint16_t l = 0; char *p = ans; + while(*p++) l++; + USB_send((uint8_t*)ans, l); + } + } + } + return 0; +} diff --git a/F1-nolib/pl2303_snippet_naked/pl2303.bin b/F1-nolib/pl2303_snippet_naked/pl2303.bin new file mode 100755 index 0000000000000000000000000000000000000000..18dee95210bb747b89a133e6be4eeea5417d1618 GIT binary patch literal 4044 zcmb_f4{#e-(cgD>vL#EkWvdCY?2J!Rj2+9Rvc;d21ag+_v!rukCrU}n_#)jM~$Ed8p9*(_ZBy7Zs>kNd=c)aJbL2lI^DM%^3hU2u#qT5RZk|{lr-(M%QcGG2G!Lvc^zdZgsa&StC%m<$WD1}#7dmsCi6IgNrVE= zAz6`bdrS2J-;!zDubg9Dj}uve#LvW=>7tsUA8G50f&05-;s&c+i+Aa zV$Wfd+Z9LVuS~oAKk{QTIbl=0IX*K-M!xIS&5{w~A;V7PNp@+bRkA6MvrRK?LD*cZ zSj7g_Op4`V#jdiswn1gEZCBdY2{j#{eMjaiCA9Tsu3(EhsIh*VOrFr;9>g=Y_@x0d z%uKP$2w9o|`$wgA)a_7Nvi}lO!65`^sNhASQO+L@XL{eJuesS_)M2^;NF zBI1Q&M1RH?EpQoAY;=#yklg3erObAtAJo5SFu9s8@ardxb_0&n+T^v?%5c58%AC! zv&PfTSX&B2XSDMi#>BaCSB2=2H%N%8Z6A}FWMvd?yPgCm5n0|D0k!?zo07(WRW!=R zoTMHl9Z{&co^(c8HOm;|z-tpaiSV|FhB=V41O4_%ZxOVxGy`I0jH|;uPBs@xMS+*J z7$ET%yKnJ(Gr*Xniyd4TCdsyUQ>~d(d#QY0kPBGCmage=D12*JFPqO}w!VS!p|Qd< z3K*XaQd!hE7CB=QUx{0G>BPEdcic87)P7K`o)kVaoeh`MlN zE&4@|I|#UgEAmF#F1p2uD;n>lS;egr3|iNBLqgnvJui46@eRc#P|Oa?_6V(uRL@Ne`h!>*Tc?JarIX(3$zpL# zK9GMBs)5BMLjN+-)(+6 z0j~Pwkcf53G?%7dkK)Y4d`?whM-tAA8+$Q!5OdBWAL=RR3NB%$*ej$vWSS-TP4@Sc zaMx!J^^|hcGrwrkPlB^U)KB7$ZrJkO)GKN1%|#kjafVM zm~G0}6M;B5xsRjOW@`0Q)ar`m*?j5K@|vZM=&vyPn_`{TAeu`cgMglEu4(-dVvdHcgTUxWewtH*#_h>4&U73M9T6?eVeV6T(wlp`5o_YsvRb@FfXJ(qU4Zohmv@AlNa zhKi5ksSCMA(*o=V0t+#}VNuw>(XU^;;QxN&G_<}QFuaUAxEckGJJI^~S8KRN-2!~- zxmez!@Tr&abT4cAwrw%}$QR*TazuPtGoAW_jQ)M-UVSRf^0dd~zA#yUxS{7@MJ{Mo zP7Xc(pjCb{_RT)47-=>kkKVyI>BMzBsf&FL92=!}tXcl6$GpCwqoc##jYCR=r0L!@AlIF{H*N2jV%a-D?#{73y{=d}}Srk#Pr#sJ089JlQ zDVdf7oPhM>3ve!!!KPku;6+2z&M+FgH2?acWg&-KaK{fMhg;!t8Y;wsR>ef-1g$QoQj)^r0R>xa0SxW-Z! z)8J^3Y?178W41GDcfFYUPCC!!O6pN7xSmgaET@&Yny6MiNrJstu0zlMSDH9Hk~~CL zR^rMx(g%jBrS{l!>HJELe=)t~JrM!dn@MNDFjOqRkru9!`p%(YZ$+|jb`0@anH*ab z1~%b0HZYLs`9X=j0#BD&J&2NQJ(Vk+9$UQ7JCM2e2L<+0DxZo%HnYIC~QUV^>ksu#It?EP}}6S@16)-;+=GR>#;_;Wa>_@i~n zT?G0@q`gRONP46pq;aJDYSU~2ZFZ0Aa<((G?(^B@?LQ^F8*d~ohhOzfAUHT0>bXmI z*CjC+!n$zBOsJ=+g;k5#Qt}Ltg;;}X<>q5R7B4jH(VP+8!>=fNdOEHdbW?e{qt=<9 zoco0C&KbwUFJ3diP<(^24$Q8_7{f7gUM;TmOuW|Qq^+&ySjk#M(c^bL-LGDeZ zGXBJsBG}vwPkg(%N^0*Z)){7i@6A9*RnQ!<^>|eiV+-#O^T?ax@@9H7vE8;F$NDTg zs!q`Rxx7hm#_Y%om$uq=ZH;UQw}nf0dSa=tHBcSd8-|lMk=V1#7gnMAQLLrv#8z%% z-Cn3ZoBaP4oBpB2|C@^i%{>|m>UUZjXl&jxfS$%9GH%`p^D*u;xJpNcYWIH=ZwH$g z!kQh5Ka;?ExxG%aw9$Gw=55rt&n!Xu$P+xJI<61dvBx==htyHeW#-D=)3eRVwARR=)bBxRs3!Iq27as zAL!`s;`_S}bsa9K+D9i3cO5#+KhSZwQwjHe7X1z(lv. + * + * 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 3 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, see . + */ + +#include "proto.h" +#include "usb.h" + +#define USND(str) do{USB_send((uint8_t*)str, sizeof(str)-1);}while(0) +const char *parse_cmd(const char *buf){ + if(buf[1] != '\n') return buf; + switch(*buf){ + /*case 'p': + pin_toggle(USBPU_port, USBPU_pin); + USND("USB pullup is "); + if(pin_read(USBPU_port, USBPU_pin)) USND("off\n"); + else USND("on\n"); + return NULL; + break;*/ + case 'R': + USND("Soft reset\n"); + NVIC_SystemReset(); + break; + case 'W': + USND("Wait for reboot\n"); + while(1){nop();}; + break; + default: // help + return + "'R' - software reset\n" + "'W' - test watchdog\n" + ; + break; + } + return NULL; +} diff --git a/F1-nolib/pl2303_snippet_naked/proto.h b/F1-nolib/pl2303_snippet_naked/proto.h new file mode 100644 index 0000000..276f146 --- /dev/null +++ b/F1-nolib/pl2303_snippet_naked/proto.h @@ -0,0 +1,24 @@ +/* + * This file is part of the pl2303 project. + * Copyright 2020 Edward V. Emelianov . + * + * 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 3 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, see . + */ +#pragma once +#ifndef PROTO_H__ +#define PROTO_H__ + +const char *parse_cmd(const char *buf); + +#endif // PROTO_H__ diff --git a/F1-nolib/pl2303_snippet_naked/usb.c b/F1-nolib/pl2303_snippet_naked/usb.c new file mode 100644 index 0000000..8dc8daf --- /dev/null +++ b/F1-nolib/pl2303_snippet_naked/usb.c @@ -0,0 +1,159 @@ +/* + * This file is part of the pl2303 project. + * Copyright 2020 Edward V. Emelianov . + * + * 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 3 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, see . + */ + +#include "usb.h" +#include "usb_lib.h" + +static volatile uint8_t tx_succesfull = 1; +static volatile uint8_t rxNE = 0; + +// interrupt IN handler (never used?) +static void EP1_Handler(){ + uint16_t epstatus = KEEP_DTOG(USB->EPnR[1]); + if(RX_FLAG(epstatus)) epstatus = (epstatus & ~USB_EPnR_STAT_TX) ^ USB_EPnR_STAT_RX; // set valid RX + else epstatus = epstatus & ~(USB_EPnR_STAT_TX|USB_EPnR_STAT_RX); + // clear CTR + epstatus = (epstatus & ~(USB_EPnR_CTR_RX|USB_EPnR_CTR_TX)); + USB->EPnR[1] = epstatus; +} + +// data IN/OUT handlers +static void transmit_Handler(){ // EP3IN + tx_succesfull = 1; + uint16_t epstatus = KEEP_DTOG_STAT(USB->EPnR[3]); + // clear CTR keep DTOGs & STATs + USB->EPnR[3] = (epstatus & ~(USB_EPnR_CTR_TX)); // clear TX ctr +} + +static void receive_Handler(){ // EP2OUT + rxNE = 1; + uint16_t epstatus = KEEP_DTOG_STAT(USB->EPnR[2]); + USB->EPnR[2] = (epstatus & ~(USB_EPnR_CTR_RX)); // clear RX ctr +} + +void USB_setup(){ + NVIC_DisableIRQ(USB_LP_CAN1_RX0_IRQn); + NVIC_DisableIRQ(USB_HP_CAN1_TX_IRQn); + RCC->APB1ENR |= RCC_APB1ENR_USBEN; + USB->CNTR = USB_CNTR_FRES; // Force USB Reset + for(uint32_t ctr = 0; ctr < 72000; ++ctr) nop(); // wait >1ms + //uint32_t ctr = 0; + USB->CNTR = 0; + USB->BTABLE = 0; + USB->DADDR = 0; + USB->ISTR = 0; + USB->CNTR = USB_CNTR_RESETM | USB_CNTR_WKUPM; // allow only wakeup & reset interrupts + NVIC_EnableIRQ(USB_LP_CAN1_RX0_IRQn); +} + +static int usbwr(const uint8_t *buf, uint16_t l){ + uint32_t ctra = 1000000; + while(--ctra && tx_succesfull == 0){ + IWDG->KR = IWDG_REFRESH; + } + tx_succesfull = 0; + EP_Write(3, buf, l); + ctra = 1000000; + while(--ctra && tx_succesfull == 0){ + IWDG->KR = IWDG_REFRESH; + } + if(tx_succesfull == 0){usbON = 0; return 1;} // usb is OFF? + return 0; +} + +static uint8_t usbbuff[USB_TXBUFSZ-1]; // temporary buffer (63 - to prevent need of ZLP) +static uint8_t buflen = 0; // amount of symbols in usbbuff + +// send next up to 63 bytes of data in usbbuff +static void send_next(){ + if(!buflen || !tx_succesfull) return; + tx_succesfull = 0; + EP_Write(3, usbbuff, buflen); + buflen = 0; +} + +// unblocking sending - just fill a buffer +void USB_send(const uint8_t *buf, uint16_t len){ + if(!usbON || !len) return; + if(len > USB_TXBUFSZ-1 - buflen){ + usbwr(usbbuff, buflen); + buflen = 0; + } + if(len > USB_TXBUFSZ-1){ + USB_send_blk(buf, len); + return; + } + while(len--) usbbuff[buflen++] = *buf++; +} + +// blocking sending +void USB_send_blk(const uint8_t *buf, uint16_t len){ + if(!usbON || !len) return; // USB disconnected + if(buflen){ + usbwr(usbbuff, buflen); + buflen = 0; + } + int needzlp = 0; + while(len){ + if(len == USB_TXBUFSZ) needzlp = 1; + uint16_t s = (len > USB_TXBUFSZ) ? USB_TXBUFSZ : len; + if(usbwr(buf, s)) return; + len -= s; + buf += s; + } + if(needzlp){ + usbwr(NULL, 0); + } +} + +void usb_proc(){ + switch(USB_Dev.USB_Status){ + case USB_STATE_CONFIGURED: + // make new BULK endpoint + // Buffer have 1024 bytes, but last 256 we use for CAN bus (30.2 of RM: USB main features) + EP_Init(1, EP_TYPE_INTERRUPT, USB_EP1BUFSZ, 0, EP1_Handler); // IN1 - transmit + EP_Init(2, EP_TYPE_BULK, 0, USB_RXBUFSZ, receive_Handler); // OUT2 - receive data + EP_Init(3, EP_TYPE_BULK, USB_TXBUFSZ, 0, transmit_Handler); // IN3 - transmit data + USB_Dev.USB_Status = USB_STATE_CONNECTED; + break; + case USB_STATE_DEFAULT: + case USB_STATE_ADDRESSED: + if(usbON){ + usbON = 0; + } + break; + default: // USB_STATE_CONNECTED - send next data portion + if(!usbON) return; + send_next(); + } +} + +/** + * @brief USB_receive + * @param buf (i) - buffer[64] for received data + * @return amount of received bytes + */ +uint8_t USB_receive(uint8_t *buf){ + if(!usbON || !rxNE) return 0; + uint8_t sz = EP_Read(2, (uint16_t*)buf); + uint16_t epstatus = KEEP_DTOG(USB->EPnR[2]); + // keep stat_tx & set ACK rx + USB->EPnR[2] = (epstatus & ~(USB_EPnR_STAT_TX)) ^ USB_EPnR_STAT_RX; + rxNE = 0; + return sz; +} diff --git a/F1-nolib/pl2303_snippet_naked/usb.h b/F1-nolib/pl2303_snippet_naked/usb.h new file mode 100644 index 0000000..b1a8333 --- /dev/null +++ b/F1-nolib/pl2303_snippet_naked/usb.h @@ -0,0 +1,33 @@ +/* + * This file is part of the pl2303 project. + * Copyright 2020 Edward V. Emelianov . + * + * 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 3 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, see . + */ + +#pragma once +#ifndef __USB_H__ +#define __USB_H__ + +#include "hardware.h" + +#define BUFFSIZE (64) + +void USB_setup(); +void usb_proc(); +void USB_send(const uint8_t *buf, uint16_t len); +void USB_send_blk(const uint8_t *buf, uint16_t len); +uint8_t USB_receive(uint8_t *buf); + +#endif // __USB_H__ diff --git a/F1-nolib/pl2303_snippet_naked/usb_defs.h b/F1-nolib/pl2303_snippet_naked/usb_defs.h new file mode 100644 index 0000000..6a798c0 --- /dev/null +++ b/F1-nolib/pl2303_snippet_naked/usb_defs.h @@ -0,0 +1,102 @@ +/* + * This file is part of the pl2303 project. + * Copyright 2020 Edward V. Emelianov . + * + * 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 3 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, see . + */ + +#pragma once +#ifndef __USB_DEFS_H__ +#define __USB_DEFS_H__ + +#include + +// max endpoints number +#define STM32ENDPOINTS 8 +/** + * Buffers size definition + **/ +#define USB_BTABLE_SIZE 512 +// first 64 bytes of USB_BTABLE are registers! +//#define USB_EP0_BASEADDR 64 +// for USB FS EP0 buffers are from 8 to 64 bytes long (64 for PL2303) +#define USB_EP0_BUFSZ 64 +// USB transmit buffer size (64 for PL2303) +#define USB_TXBUFSZ 64 +// USB receive buffer size (64 for PL2303) +#define USB_RXBUFSZ 64 +// EP1 - interrupt - buffer size +#define USB_EP1BUFSZ 8 + +#define USB_BTABLE_BASE 0x40006000 +#define USB_BASE ((uint32_t)0x40005C00) +#define USB ((USB_TypeDef *) USB_BASE) + +#ifdef USB_BTABLE +#undef USB_BTABLE +#endif +#define USB_BTABLE ((USB_BtableDef *)(USB_BTABLE_BASE)) +#define USB_ISTR_EPID 0x0000000F +#define USB_FNR_LSOF_0 0x00000800 +#define USB_FNR_lSOF_1 0x00001000 +#define USB_LPMCSR_BESL_0 0x00000010 +#define USB_LPMCSR_BESL_1 0x00000020 +#define USB_LPMCSR_BESL_2 0x00000040 +#define USB_LPMCSR_BESL_3 0x00000080 +#define USB_EPnR_CTR_RX 0x00008000 +#define USB_EPnR_DTOG_RX 0x00004000 +#define USB_EPnR_STAT_RX 0x00003000 +#define USB_EPnR_STAT_RX_0 0x00001000 +#define USB_EPnR_STAT_RX_1 0x00002000 +#define USB_EPnR_SETUP 0x00000800 +#define USB_EPnR_EP_TYPE 0x00000600 +#define USB_EPnR_EP_TYPE_0 0x00000200 +#define USB_EPnR_EP_TYPE_1 0x00000400 +#define USB_EPnR_EP_KIND 0x00000100 +#define USB_EPnR_CTR_TX 0x00000080 +#define USB_EPnR_DTOG_TX 0x00000040 +#define USB_EPnR_STAT_TX 0x00000030 +#define USB_EPnR_STAT_TX_0 0x00000010 +#define USB_EPnR_STAT_TX_1 0x00000020 +#define USB_EPnR_EA 0x0000000F +#define USB_COUNTn_RX_BLSIZE 0x00008000 +#define USB_COUNTn_NUM_BLOCK 0x00007C00 +#define USB_COUNTn_RX 0x0000003F + +#ifdef USB_TypeDef +#define USB_TypeDef USB_TypeDef_custom +#endif + +typedef struct { + __IO uint32_t EPnR[STM32ENDPOINTS]; + __IO uint32_t RESERVED[STM32ENDPOINTS]; + __IO uint32_t CNTR; + __IO uint32_t ISTR; + __IO uint32_t FNR; + __IO uint32_t DADDR; + __IO uint32_t BTABLE; +} USB_TypeDef; + +typedef struct{ + __IO uint32_t USB_ADDR_TX; + __IO uint32_t USB_COUNT_TX; + __IO uint32_t USB_ADDR_RX; + __IO uint32_t USB_COUNT_RX; +} USB_EPDATA_TypeDef; + +typedef struct{ + __IO USB_EPDATA_TypeDef EP[STM32ENDPOINTS]; +} USB_BtableDef; + +#endif // __USB_DEFS_H__ diff --git a/F1-nolib/pl2303_snippet_naked/usb_lib.c b/F1-nolib/pl2303_snippet_naked/usb_lib.c new file mode 100644 index 0000000..1fba3c0 --- /dev/null +++ b/F1-nolib/pl2303_snippet_naked/usb_lib.c @@ -0,0 +1,476 @@ +/* + * This file is part of the pl2303 project. + * Copyright 2020 Edward V. Emelianov . + * + * 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 3 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, see . + */ + +#include +#include "usb_lib.h" + +ep_t endpoints[STM32ENDPOINTS]; + +usb_dev_t USB_Dev; +static usb_LineCoding lineCoding = {115200, 0, 0, 8}; +static config_pack_t setup_packet; +static uint8_t ep0databuf[EP0DATABUF_SIZE]; +static uint8_t ep0dbuflen = 0; + +usb_LineCoding getLineCoding(){return lineCoding;} + +uint8_t usbON = 0; // device disconnected from terminal + +// definition of parts common for USB_DeviceDescriptor & USB_DeviceQualifierDescriptor +#define bcdUSB_L 0x10 +#define bcdUSB_H 0x01 +#define bDeviceClass 0 +#define bDeviceSubClass 0 +#define bDeviceProtocol 0 +#define bNumConfigurations 1 + +static const uint8_t USB_DeviceDescriptor[] = { + 18, // bLength + 0x01, // bDescriptorType - Device descriptor + bcdUSB_L, // bcdUSB_L - 1.10 + bcdUSB_H, // bcdUSB_H + bDeviceClass, // bDeviceClass - USB_COMM + bDeviceSubClass, // bDeviceSubClass + bDeviceProtocol, // bDeviceProtocol + USB_EP0_BUFSZ, // bMaxPacketSize + 0x7b, // idVendor_L PL2303: VID=0x067b, PID=0x2303 + 0x06, // idVendor_H + 0x03, // idProduct_L + 0x23, // idProduct_H + 0x00, // bcdDevice_Ver_L + 0x03, // bcdDevice_Ver_H + 0x01, // iManufacturer + 0x02, // iProduct + 0x00, // iSerialNumber + bNumConfigurations // bNumConfigurations +}; + +static const uint8_t USB_DeviceQualifierDescriptor[] = { + 10, //bLength + 0x06, // bDescriptorType - Device qualifier + bcdUSB_L, // bcdUSB_L + bcdUSB_H, // bcdUSB_H + bDeviceClass, // bDeviceClass + bDeviceSubClass, // bDeviceSubClass + bDeviceProtocol, // bDeviceProtocol + USB_EP0_BUFSZ, // bMaxPacketSize0 + bNumConfigurations, // bNumConfigurations + 0x00 // Reserved +}; + +static const uint8_t USB_ConfigDescriptor[] = { + /*Configuration Descriptor*/ + 0x09, /* bLength: Configuration Descriptor size */ + 0x02, /* bDescriptorType: Configuration */ + 39, /* wTotalLength:no of returned bytes */ + 0x00, + 0x01, /* bNumInterfaces: 1 interface */ + 0x01, /* bConfigurationValue: Configuration value */ + 0x00, /* iConfiguration: Index of string descriptor describing the configuration */ + 0xa0, /* bmAttributes - Bus powered, Remote wakeup */ + 0x32, /* MaxPower 100 mA */ + + /*---------------------------------------------------------------------------*/ + + /*Interface Descriptor */ + 0x09, /* bLength: Interface Descriptor size */ + 0x04, /* bDescriptorType: Interface */ + 0x00, /* bInterfaceNumber: Number of Interface */ + 0x00, /* bAlternateSetting: Alternate setting */ + 0x03, /* bNumEndpoints: 3 endpoints used */ + 0xff, /* bInterfaceClass */ + 0x00, /* bInterfaceSubClass */ + 0x00, /* bInterfaceProtocol */ + 0x00, /* iInterface: */ +/////////////////////////////////////////////////// + /*Endpoint 1 Descriptor*/ + 0x07, /* bLength: Endpoint Descriptor size */ + 0x05, /* bDescriptorType: Endpoint */ + 0x81, /* bEndpointAddress IN1 */ + 0x03, /* bmAttributes: Interrupt */ + 0x0a, /* wMaxPacketSize LO: */ + 0x00, /* wMaxPacketSize HI: */ + 0x01, /* bInterval: */ + + /*Endpoint OUT2 Descriptor*/ + 0x07, /* bLength: Endpoint Descriptor size */ + 0x05, /* bDescriptorType: Endpoint */ + 0x02, /* bEndpointAddress: OUT2 */ + 0x02, /* bmAttributes: Bulk */ + (USB_RXBUFSZ & 0xff), /* wMaxPacketSize: 64 */ + (USB_RXBUFSZ >> 8), + 0x00, /* bInterval: ignore for Bulk transfer */ + + /*Endpoint IN3 Descriptor*/ + 0x07, /* bLength: Endpoint Descriptor size */ + 0x05, /* bDescriptorType: Endpoint */ + 0x83, /* bEndpointAddress IN3 */ + 0x02, /* bmAttributes: Bulk */ + (USB_TXBUFSZ & 0xff), /* wMaxPacketSize: 64 */ + (USB_TXBUFSZ >> 8), + 0x00, /* bInterval: ignore for Bulk transfer */ +}; + +_USB_LANG_ID_(USB_StringLangDescriptor, LANG_US); +// these descriptors are not used in PL2303 emulator! +_USB_STRING_(USB_StringSerialDescriptor, u"0"); +_USB_STRING_(USB_StringManufacturingDescriptor, u"Prolific Technology Inc."); +_USB_STRING_(USB_StringProdDescriptor, u"USB-Serial Controller"); + +/* + * default handlers + */ +// SET_LINE_CODING +void WEAK linecoding_handler(usb_LineCoding __attribute__((unused)) *lc){ +} + +// SET_CONTROL_LINE_STATE +void WEAK clstate_handler(uint16_t __attribute__((unused)) val){ +} + +// SEND_BREAK +void WEAK break_handler(){ +} + +// handler of vendor requests +void WEAK vendor_handler(config_pack_t *packet){ + if(packet->bmRequestType & 0x80){ // read + uint8_t c; + switch(packet->wValue){ + case 0x8484: + c = 2; + break; + case 0x0080: + c = 1; + break; + case 0x8686: + c = 0xaa; + break; + default: + c = 0; + } + EP_WriteIRQ(0, &c, 1); + }else{ // write ZLP + EP_WriteIRQ(0, (uint8_t *)0, 0); + } +} + +static void wr0(const uint8_t *buf, uint16_t size){ + if(setup_packet.wLength < size) size = setup_packet.wLength; // shortened request + if(size < endpoints[0].txbufsz){ + EP_WriteIRQ(0, buf, size); + return; + } + while(size){ + uint16_t l = size; + if(l > endpoints[0].txbufsz) l = endpoints[0].txbufsz; + EP_WriteIRQ(0, buf, l); + buf += l; + size -= l; + uint8_t needzlp = (l == endpoints[0].txbufsz) ? 1 : 0; + if(size || needzlp){ // send last data buffer + uint16_t status = KEEP_DTOG(USB->EPnR[0]); + // keep DTOGs, clear CTR_RX,TX, set TX VALID, leave stat_Rx + USB->EPnR[0] = (status & ~(USB_EPnR_CTR_RX|USB_EPnR_CTR_TX|USB_EPnR_STAT_RX)) + ^ USB_EPnR_STAT_TX; + uint32_t ctr = 1000000; + while(--ctr && (USB->ISTR & USB_ISTR_CTR) == 0){IWDG->KR = IWDG_REFRESH;}; + if((USB->ISTR & USB_ISTR_CTR) == 0){ + return; + } + if(needzlp) EP_WriteIRQ(0, (uint8_t*)0, 0); + } + } +} + +static inline void get_descriptor(){ + switch(setup_packet.wValue){ + case DEVICE_DESCRIPTOR: + wr0(USB_DeviceDescriptor, sizeof(USB_DeviceDescriptor)); + break; + case CONFIGURATION_DESCRIPTOR: + wr0(USB_ConfigDescriptor, sizeof(USB_ConfigDescriptor)); + break; + case STRING_LANG_DESCRIPTOR: + wr0((const uint8_t *)&USB_StringLangDescriptor, STRING_LANG_DESCRIPTOR_SIZE_BYTE); + break; + case STRING_MAN_DESCRIPTOR: + wr0((const uint8_t *)&USB_StringManufacturingDescriptor, USB_StringManufacturingDescriptor.bLength); + break; + case STRING_PROD_DESCRIPTOR: + wr0((const uint8_t *)&USB_StringProdDescriptor, USB_StringProdDescriptor.bLength); + break; + case STRING_SN_DESCRIPTOR: + wr0((const uint8_t *)&USB_StringSerialDescriptor, USB_StringSerialDescriptor.bLength); + break; + case DEVICE_QUALIFIER_DESCRIPTOR: + wr0(USB_DeviceQualifierDescriptor, USB_DeviceQualifierDescriptor[0]); + break; + default: + break; + } +} + +static uint8_t configuration = 0; // reply for GET_CONFIGURATION (==1 if configured) +static inline void std_d2h_req(){ + uint16_t status = 0; // bus powered + switch(setup_packet.bRequest){ + case GET_DESCRIPTOR: + get_descriptor(); + break; + case GET_STATUS: + EP_WriteIRQ(0, (uint8_t *)&status, 2); // send status: Bus Powered + break; + case GET_CONFIGURATION: + EP_WriteIRQ(0, &configuration, 1); + break; + default: + break; + } +} + +static inline void std_h2d_req(){ + switch(setup_packet.bRequest){ + case SET_ADDRESS: + // new address will be assigned later - after acknowlegement or request to host + USB_Dev.USB_Addr = setup_packet.wValue; + break; + case SET_CONFIGURATION: + // Now device configured + USB_Dev.USB_Status = USB_STATE_CONFIGURED; + configuration = setup_packet.wValue; + break; + default: + break; + } +} + +/* +bmRequestType: 76543210 +7 direction: 0 - host->device, 1 - device->host +65 type: 0 - standard, 1 - class, 2 - vendor +4..0 getter: 0 - device, 1 - interface, 2 - endpoint, 3 - other +*/ +/** + * Endpoint0 (control) handler + */ +static void EP0_Handler(){ + uint16_t epstatus = USB->EPnR[0]; // EP0R on input -> return this value after modifications + uint8_t reqtype = setup_packet.bmRequestType & 0x7f; + uint8_t dev2host = (setup_packet.bmRequestType & 0x80) ? 1 : 0; + int rxflag = RX_FLAG(epstatus); + if(rxflag && SETUP_FLAG(epstatus)){ + switch(reqtype){ + case STANDARD_DEVICE_REQUEST_TYPE: // standard device request + if(dev2host){ + std_d2h_req(); + }else{ + std_h2d_req(); + EP_WriteIRQ(0, (uint8_t *)0, 0); + } + break; + case STANDARD_ENDPOINT_REQUEST_TYPE: // standard endpoint request + if(setup_packet.bRequest == CLEAR_FEATURE){ + EP_WriteIRQ(0, (uint8_t *)0, 0); + } + break; + case VENDOR_REQUEST_TYPE: + vendor_handler(&setup_packet); + break; + case CONTROL_REQUEST_TYPE: + switch(setup_packet.bRequest){ + case GET_LINE_CODING: + EP_WriteIRQ(0, (uint8_t*)&lineCoding, sizeof(lineCoding)); + break; + case SET_LINE_CODING: // omit this for next stage, when data will come + break; + case SET_CONTROL_LINE_STATE: + usbON = 1; + clstate_handler(setup_packet.wValue); + break; + case SEND_BREAK: + usbON = 0; + break_handler(); + break; + default: + break; + } + if(setup_packet.bRequest != GET_LINE_CODING) EP_WriteIRQ(0, (uint8_t *)0, 0); // write acknowledgement + break; + default: + EP_WriteIRQ(0, (uint8_t *)0, 0); + } + }else if(rxflag){ // got data over EP0 or host acknowlegement + if(endpoints[0].rx_cnt){ + if(setup_packet.bRequest == SET_LINE_CODING){ + linecoding_handler((usb_LineCoding*)ep0databuf); + } + } + } else if(TX_FLAG(epstatus)){ // package transmitted + // now we can change address after enumeration + if ((USB->DADDR & USB_DADDR_ADD) != USB_Dev.USB_Addr){ + USB->DADDR = USB_DADDR_EF | USB_Dev.USB_Addr; + // change state to ADRESSED + USB_Dev.USB_Status = USB_STATE_ADDRESSED; + } + } + epstatus = KEEP_DTOG(USB->EPnR[0]); + if(rxflag) epstatus ^= USB_EPnR_STAT_TX; // start ZLP/data transmission + else epstatus &= ~USB_EPnR_STAT_TX; // or leave unchanged + // keep DTOGs, clear CTR_RX,TX, set RX VALID + USB->EPnR[0] = (epstatus & ~(USB_EPnR_CTR_RX|USB_EPnR_CTR_TX)) ^ USB_EPnR_STAT_RX; +} + +static uint16_t lastaddr = LASTADDR_DEFAULT; +/** + * Endpoint initialisation + * @param number - EP num (0...7) + * @param type - EP type (EP_TYPE_BULK, EP_TYPE_CONTROL, EP_TYPE_ISO, EP_TYPE_INTERRUPT) + * @param txsz - transmission buffer size @ USB/CAN buffer + * @param rxsz - reception buffer size @ USB/CAN buffer + * @param uint16_t (*func)(ep_t *ep) - EP handler function + * @return 0 if all OK + */ +int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)(ep_t ep)){ + if(number >= STM32ENDPOINTS) return 4; // out of configured amount + if(txsz > USB_BTABLE_SIZE || rxsz > USB_BTABLE_SIZE) return 1; // buffer too large + if(lastaddr + txsz + rxsz >= USB_BTABLE_SIZE) return 2; // out of btable + USB->EPnR[number] = (type << 9) | (number & USB_EPnR_EA); + USB->EPnR[number] ^= USB_EPnR_STAT_RX | USB_EPnR_STAT_TX_1; + if(rxsz & 1 || rxsz > 512) return 3; // wrong rx buffer size + uint16_t countrx = 0; + if(rxsz < 64) countrx = rxsz / 2; + else{ + if(rxsz & 0x1f) return 3; // should be multiple of 32 + countrx = 31 + rxsz / 32; + } + USB_BTABLE->EP[number].USB_ADDR_TX = lastaddr; + endpoints[number].tx_buf = (uint16_t *)(USB_BTABLE_BASE + lastaddr*2); + endpoints[number].txbufsz = txsz; + lastaddr += txsz; + USB_BTABLE->EP[number].USB_COUNT_TX = 0; + USB_BTABLE->EP[number].USB_ADDR_RX = lastaddr; + endpoints[number].rx_buf = (uint16_t *)(USB_BTABLE_BASE + lastaddr*2); + lastaddr += rxsz; + USB_BTABLE->EP[number].USB_COUNT_RX = countrx << 10; + endpoints[number].func = func; + return 0; +} + +// standard IRQ handler +void usb_lp_can_rx0_isr(){ + if(USB->ISTR & USB_ISTR_RESET){ + usbON = 0; + // Reinit registers + USB->CNTR = USB_CNTR_RESETM | USB_CNTR_CTRM | USB_CNTR_SUSPM | USB_CNTR_WKUPM; + USB->ISTR = 0; + // Endpoint 0 - CONTROL + // ON USB LS size of EP0 may be 8 bytes, but on FS it should be 64 bytes! + lastaddr = LASTADDR_DEFAULT; + // clear address, leave only enable bit + USB->DADDR = USB_DADDR_EF; + USB_Dev.USB_Status = USB_STATE_DEFAULT; + USB->ISTR = ~USB_ISTR_RESET; + if(EP_Init(0, EP_TYPE_CONTROL, USB_EP0_BUFSZ, USB_EP0_BUFSZ, EP0_Handler)){ + return; + } + } + if(USB->ISTR & USB_ISTR_CTR){ + // EP number + uint8_t n = USB->ISTR & USB_ISTR_EPID; + // copy status register + uint16_t epstatus = USB->EPnR[n]; + // copy received bytes amount + endpoints[n].rx_cnt = USB_BTABLE->EP[n].USB_COUNT_RX & 0x3FF; // low 10 bits is counter + // check direction + if(USB->ISTR & USB_ISTR_DIR){ // OUT interrupt - receive data, CTR_RX==1 (if CTR_TX == 1 - two pending transactions: receive following by transmit) + if(n == 0){ // control endpoint + if(epstatus & USB_EPnR_SETUP){ // setup packet -> copy data to conf_pack + EP_Read(0, (uint16_t*)&setup_packet); + ep0dbuflen = 0; + // interrupt handler will be called later + }else if(epstatus & USB_EPnR_CTR_RX){ // data packet -> push received data to ep0databuf + ep0dbuflen = endpoints[0].rx_cnt; + EP_Read(0, (uint16_t*)&ep0databuf); + } + } + } + // call EP handler + if(endpoints[n].func) endpoints[n].func(endpoints[n]); + } + if(USB->ISTR & USB_ISTR_SUSP){ // suspend -> still no connection, may sleep + usbON = 0; + USB->CNTR |= USB_CNTR_FSUSP | USB_CNTR_LP_MODE; + USB->ISTR = ~USB_ISTR_SUSP; + } + if(USB->ISTR & USB_ISTR_WKUP){ // wakeup + USB->CNTR &= ~(USB_CNTR_FSUSP | USB_CNTR_LP_MODE); // clear suspend flags + USB->ISTR = ~USB_ISTR_WKUP; + } +} + +/** + * Write data to EP buffer (called from IRQ handler) + * @param number - EP number + * @param *buf - array with data + * @param size - its size + */ +void EP_WriteIRQ(uint8_t number, const uint8_t *buf, uint16_t size){ + uint8_t i; + if(size > endpoints[number].txbufsz) size = endpoints[number].txbufsz; + uint16_t N2 = (size + 1) >> 1; + // the buffer is 16-bit, so we should copy data as it would be uint16_t + uint16_t *buf16 = (uint16_t *)buf; + uint32_t *out = (uint32_t *)endpoints[number].tx_buf; + for(i = 0; i < N2; ++i, ++out){ + *out = buf16[i]; + } + USB_BTABLE->EP[number].USB_COUNT_TX = size; +} + +/** + * Write data to EP buffer (called outside IRQ handler) + * @param number - EP number + * @param *buf - array with data + * @param size - its size + */ +void EP_Write(uint8_t number, const uint8_t *buf, uint16_t size){ + EP_WriteIRQ(number, buf, size); + uint16_t status = KEEP_DTOG(USB->EPnR[number]); + // keep DTOGs, clear CTR_TX & set TX VALID to start transmission + USB->EPnR[number] = (status & ~(USB_EPnR_CTR_TX)) ^ USB_EPnR_STAT_TX; +} + +/* + * Copy data from EP buffer into user buffer area + * @param *buf - user array for data + * @return amount of data read + */ +int EP_Read(uint8_t number, uint16_t *buf){ + int sz = endpoints[number].rx_cnt; + if(!sz) return 0; + endpoints[number].rx_cnt = 0; + int n = (sz + 1) >> 1; + uint32_t *in = (uint32_t *)endpoints[number].rx_buf; + if(n){ + for(int i = 0; i < n; ++i, ++in) + buf[i] = *(uint16_t*)in; + } + return sz; +} + diff --git a/F1-nolib/pl2303_snippet_naked/usb_lib.h b/F1-nolib/pl2303_snippet_naked/usb_lib.h new file mode 100644 index 0000000..5070704 --- /dev/null +++ b/F1-nolib/pl2303_snippet_naked/usb_lib.h @@ -0,0 +1,184 @@ +/* + * This file is part of the pl2303 project. + * Copyright 2020 Edward V. Emelianov . + * + * 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 3 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, see . + */ + +#pragma once +#ifndef __USB_LIB_H__ +#define __USB_LIB_H__ + +#include +#include "usb_defs.h" + +#define EP0DATABUF_SIZE (64) +#define LASTADDR_DEFAULT (STM32ENDPOINTS * 8) + +// bmRequestType & 0x7f +#define STANDARD_DEVICE_REQUEST_TYPE 0 +#define STANDARD_ENDPOINT_REQUEST_TYPE 2 +#define VENDOR_REQUEST_TYPE 0x40 +#define CONTROL_REQUEST_TYPE 0x21 +// bRequest, standard; for bmRequestType == 0x80 +#define GET_STATUS 0x00 +#define GET_DESCRIPTOR 0x06 +#define GET_CONFIGURATION 0x08 +// for bmRequestType == 0 +#define CLEAR_FEATURE 0x01 +#define SET_FEATURE 0x03 // unused +#define SET_ADDRESS 0x05 +#define SET_DESCRIPTOR 0x07 // unused +#define SET_CONFIGURATION 0x09 +// for bmRequestType == 0x81, 1 or 0xB2 +#define GET_INTERFACE 0x0A // unused +#define SET_INTERFACE 0x0B // unused +#define SYNC_FRAME 0x0C // unused +#define VENDOR_REQUEST 0x01 // unused + +// Class-Specific Control Requests +#define SEND_ENCAPSULATED_COMMAND 0x00 // unused +#define GET_ENCAPSULATED_RESPONSE 0x01 // unused +#define SET_COMM_FEATURE 0x02 // unused +#define GET_COMM_FEATURE 0x03 // unused +#define CLEAR_COMM_FEATURE 0x04 // unused +#define SET_LINE_CODING 0x20 +#define GET_LINE_CODING 0x21 +#define SET_CONTROL_LINE_STATE 0x22 +#define SEND_BREAK 0x23 + +// control line states +#define CONTROL_DTR 0x01 +#define CONTROL_RTS 0x02 + +// wValue +#define DEVICE_DESCRIPTOR 0x100 +#define CONFIGURATION_DESCRIPTOR 0x200 +#define STRING_LANG_DESCRIPTOR 0x300 +#define STRING_MAN_DESCRIPTOR 0x301 +#define STRING_PROD_DESCRIPTOR 0x302 +#define STRING_SN_DESCRIPTOR 0x303 +#define DEVICE_QUALIFIER_DESCRIPTOR 0x600 + +#define RX_FLAG(epstat) (epstat & USB_EPnR_CTR_RX) +#define TX_FLAG(epstat) (epstat & USB_EPnR_CTR_TX) +#define SETUP_FLAG(epstat) (epstat & USB_EPnR_SETUP) + +// EPnR bits manipulation +#define KEEP_DTOG_STAT(EPnR) (EPnR & ~(USB_EPnR_STAT_RX|USB_EPnR_STAT_TX|USB_EPnR_DTOG_RX|USB_EPnR_DTOG_TX)) +#define KEEP_DTOG(EPnR) (EPnR & ~(USB_EPnR_DTOG_RX|USB_EPnR_DTOG_TX)) + +// USB state: uninitialized, addressed, ready for use +typedef enum{ + USB_STATE_DEFAULT, + USB_STATE_ADDRESSED, + USB_STATE_CONFIGURED, + USB_STATE_CONNECTED +} USB_state; + +// EP types +#define EP_TYPE_BULK 0x00 +#define EP_TYPE_CONTROL 0x01 +#define EP_TYPE_ISO 0x02 +#define EP_TYPE_INTERRUPT 0x03 + +#define LANG_US (uint16_t)0x0409 + +#define _USB_STRING_(name, str) \ +static const struct name \ +{ \ + uint8_t bLength; \ + uint8_t bDescriptorType; \ + uint16_t bString[(sizeof(str) - 2) / 2]; \ + \ +} \ +name = {sizeof(name), 0x03, str} + +#define _USB_LANG_ID_(name, lng_id) \ + \ +static const struct name \ +{ \ + uint8_t bLength; \ + uint8_t bDescriptorType; \ + uint16_t bString; \ + \ +} \ +name = {0x04, 0x03, lng_id} +#define STRING_LANG_DESCRIPTOR_SIZE_BYTE (4) + +// EP0 configuration packet +typedef struct { + uint8_t bmRequestType; + uint8_t bRequest; + uint16_t wValue; + uint16_t wIndex; + uint16_t wLength; +} config_pack_t; + +// endpoints state +typedef struct{ + uint16_t *tx_buf; // transmission buffer address + uint16_t txbufsz; // transmission buffer size + uint16_t *rx_buf; // reception buffer address + void (*func)(); // endpoint action function + unsigned rx_cnt : 10; // received data counter +} ep_t; + +// USB status & its address +typedef struct { + uint8_t USB_Status; + uint16_t USB_Addr; +}usb_dev_t; + +typedef struct { + uint32_t dwDTERate; + uint8_t bCharFormat; + #define USB_CDC_1_STOP_BITS 0 + #define USB_CDC_1_5_STOP_BITS 1 + #define USB_CDC_2_STOP_BITS 2 + uint8_t bParityType; + #define USB_CDC_NO_PARITY 0 + #define USB_CDC_ODD_PARITY 1 + #define USB_CDC_EVEN_PARITY 2 + #define USB_CDC_MARK_PARITY 3 + #define USB_CDC_SPACE_PARITY 4 + uint8_t bDataBits; +} __attribute__ ((packed)) usb_LineCoding; + +typedef struct { + uint8_t bmRequestType; + uint8_t bNotificationType; + uint16_t wValue; + uint16_t wIndex; + uint16_t wLength; +} __attribute__ ((packed)) usb_cdc_notification; + +extern ep_t endpoints[]; +extern usb_dev_t USB_Dev; +extern uint8_t usbON; + +void USB_Init(); +void USB_ResetState(); +int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)()); +void EP_WriteIRQ(uint8_t number, const uint8_t *buf, uint16_t size); +void EP_Write(uint8_t number, const uint8_t *buf, uint16_t size); +int EP_Read(uint8_t number, uint16_t *buf); +usb_LineCoding getLineCoding(); + +void linecoding_handler(usb_LineCoding *lc); +void clstate_handler(uint16_t val); +void break_handler(); +void vendor_handler(config_pack_t *packet); + +#endif // __USB_LIB_H__