eddy/stm32samples
1
0
Fork 0
mirror of https://github.com/eddyem/stm32samples.git synced 2025-12-07 11:15:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix USB error

Browse Source
This commit is contained in:
eddyem 2019-07-12 12:31:08 +03:00
parent 20728db47f
commit 9a010dfa13
7 changed files with 806 additions and 806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F0-nolib/F0_testbrd/usb_lib.c
View File

@ -310,7 +310,7 @@ static uint16_t EP0_Handler(ep_t ep){
} }
}else if (ep.rx_flag){ // got data over EP0 or host acknowlegement }else if (ep.rx_flag){ // got data over EP0 or host acknowlegement
if(ep.rx_cnt){ if(ep.rx_cnt){
EP_WriteIRQ(0, (uint8_t *)0, 0); // EP_WriteIRQ(0, (uint8_t *)0, 0);
if(setup_packet.bRequest == SET_LINE_CODING){ if(setup_packet.bRequest == SET_LINE_CODING){
linecoding_handler((usb_LineCoding*)ep0databuf); linecoding_handler((usb_LineCoding*)ep0databuf);
} }

2
F0-nolib/pl2303/usb_lib.c
View File

@ -333,7 +333,7 @@ static uint16_t EP0_Handler(ep_t ep){
} }
}else if (ep.rx_flag){ // got data over EP0 or host acknowlegement }else if (ep.rx_flag){ // got data over EP0 or host acknowlegement
if(ep.rx_cnt){ if(ep.rx_cnt){
EP_WriteIRQ(0, (uint8_t *)0, 0); // EP_WriteIRQ(0, (uint8_t *)0, 0);
if(setup_packet.bRequest == SET_LINE_CODING){ if(setup_packet.bRequest == SET_LINE_CODING){
//WRITEDUMP("SET_LINE_CODING"); //WRITEDUMP("SET_LINE_CODING");
linecoding_handler((usb_LineCoding*)ep0databuf); linecoding_handler((usb_LineCoding*)ep0databuf);

184
F0-nolib/usbcdc/usb_defs.h
View File

@ -1,92 +1,92 @@
/* /*
* geany_encoding=koi8-r * geany_encoding=koi8-r
* usb_defs.h * usb_defs.h
* *
* Copyright 2018 Edward V. Emelianov <eddy@sao.ru, edward.emelianoff@gmail.com> * Copyright 2018 Edward V. Emelianov <eddy@sao.ru, edward.emelianoff@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA. * MA 02110-1301, USA.
* *
*/ */
#pragma once #pragma once
#ifndef __USB_DEFS_H__ #ifndef __USB_DEFS_H__
#define __USB_DEFS_H__ #define __USB_DEFS_H__
#include <stm32f0xx.h> #include <stm32f0xx.h>
#define USB_BTABLE_BASE 0x40006000 #define USB_BTABLE_BASE 0x40006000
#undef USB_BTABLE #undef USB_BTABLE
#define USB_BTABLE ((USB_BtableDef *)(USB_BTABLE_BASE)) #define USB_BTABLE ((USB_BtableDef *)(USB_BTABLE_BASE))
#define USB_ISTR_EPID 0x0000000F #define USB_ISTR_EPID 0x0000000F
#define USB_FNR_LSOF_0 0x00000800 #define USB_FNR_LSOF_0 0x00000800
#define USB_FNR_lSOF_1 0x00001000 #define USB_FNR_lSOF_1 0x00001000
#define USB_LPMCSR_BESL_0 0x00000010 #define USB_LPMCSR_BESL_0 0x00000010
#define USB_LPMCSR_BESL_1 0x00000020 #define USB_LPMCSR_BESL_1 0x00000020
#define USB_LPMCSR_BESL_2 0x00000040 #define USB_LPMCSR_BESL_2 0x00000040
#define USB_LPMCSR_BESL_3 0x00000080 #define USB_LPMCSR_BESL_3 0x00000080
#define USB_EPnR_CTR_RX 0x00008000 #define USB_EPnR_CTR_RX 0x00008000
#define USB_EPnR_DTOG_RX 0x00004000 #define USB_EPnR_DTOG_RX 0x00004000
#define USB_EPnR_STAT_RX 0x00003000 #define USB_EPnR_STAT_RX 0x00003000
#define USB_EPnR_STAT_RX_0 0x00001000 #define USB_EPnR_STAT_RX_0 0x00001000
#define USB_EPnR_STAT_RX_1 0x00002000 #define USB_EPnR_STAT_RX_1 0x00002000
#define USB_EPnR_SETUP 0x00000800 #define USB_EPnR_SETUP 0x00000800
#define USB_EPnR_EP_TYPE 0x00000600 #define USB_EPnR_EP_TYPE 0x00000600
#define USB_EPnR_EP_TYPE_0 0x00000200 #define USB_EPnR_EP_TYPE_0 0x00000200
#define USB_EPnR_EP_TYPE_1 0x00000400 #define USB_EPnR_EP_TYPE_1 0x00000400
#define USB_EPnR_EP_KIND 0x00000100 #define USB_EPnR_EP_KIND 0x00000100
#define USB_EPnR_CTR_TX 0x00000080 #define USB_EPnR_CTR_TX 0x00000080
#define USB_EPnR_DTOG_TX 0x00000040 #define USB_EPnR_DTOG_TX 0x00000040
#define USB_EPnR_STAT_TX 0x00000030 #define USB_EPnR_STAT_TX 0x00000030
#define USB_EPnR_STAT_TX_0 0x00000010 #define USB_EPnR_STAT_TX_0 0x00000010
#define USB_EPnR_STAT_TX_1 0x00000020 #define USB_EPnR_STAT_TX_1 0x00000020
#define USB_EPnR_EA 0x0000000F #define USB_EPnR_EA 0x0000000F
#define USB_COUNTn_RX_BLSIZE 0x00008000 #define USB_COUNTn_RX_BLSIZE 0x00008000
#define USB_COUNTn_NUM_BLOCK 0x00007C00 #define USB_COUNTn_NUM_BLOCK 0x00007C00
#define USB_COUNTn_RX 0x0000003F #define USB_COUNTn_RX 0x0000003F
#define USB_TypeDef USB_TypeDef_custom #define USB_TypeDef USB_TypeDef_custom
typedef struct{ typedef struct{
__IO uint32_t EPnR[8]; __IO uint32_t EPnR[8];
__IO uint32_t RESERVED1; __IO uint32_t RESERVED1;
__IO uint32_t RESERVED2; __IO uint32_t RESERVED2;
__IO uint32_t RESERVED3; __IO uint32_t RESERVED3;
__IO uint32_t RESERVED4; __IO uint32_t RESERVED4;
__IO uint32_t RESERVED5; __IO uint32_t RESERVED5;
__IO uint32_t RESERVED6; __IO uint32_t RESERVED6;
__IO uint32_t RESERVED7; __IO uint32_t RESERVED7;
__IO uint32_t RESERVED8; __IO uint32_t RESERVED8;
__IO uint32_t CNTR; __IO uint32_t CNTR;
__IO uint32_t ISTR; __IO uint32_t ISTR;
__IO uint32_t FNR; __IO uint32_t FNR;
__IO uint32_t DADDR; __IO uint32_t DADDR;
__IO uint32_t BTABLE; __IO uint32_t BTABLE;
__IO uint32_t LPMCSR; __IO uint32_t LPMCSR;
__IO uint32_t BCDR; __IO uint32_t BCDR;
} USB_TypeDef; } USB_TypeDef;
typedef struct{ typedef struct{
__IO uint16_t USB_ADDR_TX; __IO uint16_t USB_ADDR_TX;
__IO uint16_t USB_COUNT_TX; __IO uint16_t USB_COUNT_TX;
__IO uint16_t USB_ADDR_RX; __IO uint16_t USB_ADDR_RX;
__IO uint16_t USB_COUNT_RX; __IO uint16_t USB_COUNT_RX;
} USB_EPDATA_TypeDef; } USB_EPDATA_TypeDef;
typedef struct{ typedef struct{
__IO USB_EPDATA_TypeDef EP[8]; __IO USB_EPDATA_TypeDef EP[8];
} USB_BtableDef; } USB_BtableDef;
#endif // __USB_DEFS_H__ #endif // __USB_DEFS_H__

1014
F0-nolib/usbcdc/usb_lib.c
View File

File diff suppressed because it is too large Load Diff

406
F0-nolib/usbcdc/usb_lib.h
View File

@ -1,203 +1,203 @@
/* /*
* geany_encoding=koi8-r * geany_encoding=koi8-r
* usb_lib.h * usb_lib.h
* *
* Copyright 2018 Edward V. Emelianov <eddy@sao.ru, edward.emelianoff@gmail.com> * Copyright 2018 Edward V. Emelianov <eddy@sao.ru, edward.emelianoff@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA. * MA 02110-1301, USA.
* *
*/ */
#pragma once #pragma once
#ifndef __USB_LIB_H__ #ifndef __USB_LIB_H__
#define __USB_LIB_H__ #define __USB_LIB_H__
#include <wchar.h> #include <wchar.h>
#include "usb_defs.h" #include "usb_defs.h"
// Max EP amount (EP0 + other used) // Max EP amount (EP0 + other used)
#define MAX_ENDPOINTS 4 #define MAX_ENDPOINTS 4
// bRequest, standard; for bmRequestType == 0x80 // bRequest, standard; for bmRequestType == 0x80
#define GET_STATUS 0x00 #define GET_STATUS 0x00
#define GET_DESCRIPTOR 0x06 #define GET_DESCRIPTOR 0x06
#define GET_CONFIGURATION 0x08 #define GET_CONFIGURATION 0x08
// for bmRequestType == 0 // for bmRequestType == 0
#define CLEAR_FEATURE 0x01 #define CLEAR_FEATURE 0x01
#define SET_FEATURE 0x03 // unused #define SET_FEATURE 0x03 // unused
#define SET_ADDRESS 0x05 #define SET_ADDRESS 0x05
#define SET_DESCRIPTOR 0x07 // unused #define SET_DESCRIPTOR 0x07 // unused
#define SET_CONFIGURATION 0x09 #define SET_CONFIGURATION 0x09
// for bmRequestType == 0x81, 1 or 0xB2 // for bmRequestType == 0x81, 1 or 0xB2
#define GET_INTERFACE 0x0A // unused #define GET_INTERFACE 0x0A // unused
#define SET_INTERFACE 0x0B // unused #define SET_INTERFACE 0x0B // unused
#define SYNC_FRAME 0x0C // unused #define SYNC_FRAME 0x0C // unused
// vendor requests // vendor requests
#define VENDOR_MASK_REQUEST 0x40 #define VENDOR_MASK_REQUEST 0x40
#define VENDOR_READ_REQUEST_TYPE 0xc0 #define VENDOR_READ_REQUEST_TYPE 0xc0
#define VENDOR_WRITE_REQUEST_TYPE 0x40 #define VENDOR_WRITE_REQUEST_TYPE 0x40
#define VENDOR_REQUEST 0x01 #define VENDOR_REQUEST 0x01
#define CONTROL_REQUEST_TYPE 0x21 #define CONTROL_REQUEST_TYPE 0x21
// Class-Specific Control Requests // Class-Specific Control Requests
#define SEND_ENCAPSULATED_COMMAND 0x00 #define SEND_ENCAPSULATED_COMMAND 0x00
#define GET_ENCAPSULATED_RESPONSE 0x01 #define GET_ENCAPSULATED_RESPONSE 0x01
#define SET_COMM_FEATURE 0x02 #define SET_COMM_FEATURE 0x02
#define GET_COMM_FEATURE 0x03 #define GET_COMM_FEATURE 0x03
#define CLEAR_COMM_FEATURE 0x04 #define CLEAR_COMM_FEATURE 0x04
#define SET_LINE_CODING 0x20 #define SET_LINE_CODING 0x20
#define GET_LINE_CODING 0x21 #define GET_LINE_CODING 0x21
#define SET_CONTROL_LINE_STATE 0x22 #define SET_CONTROL_LINE_STATE 0x22
#define SEND_BREAK 0x23 #define SEND_BREAK 0x23
// control line states // control line states
#define CONTROL_DTR 0x01 #define CONTROL_DTR 0x01
#define CONTROL_RTS 0x02 #define CONTROL_RTS 0x02
// wValue // wValue
#define DEVICE_DESCRIPTOR 0x100 #define DEVICE_DESCRIPTOR 0x100
#define CONFIGURATION_DESCRIPTOR 0x200 #define CONFIGURATION_DESCRIPTOR 0x200
#define STRING_LANG_DESCRIPTOR 0x300 #define STRING_LANG_DESCRIPTOR 0x300
#define STRING_MAN_DESCRIPTOR 0x301 #define STRING_MAN_DESCRIPTOR 0x301
#define STRING_PROD_DESCRIPTOR 0x302 #define STRING_PROD_DESCRIPTOR 0x302
#define STRING_SN_DESCRIPTOR 0x303 #define STRING_SN_DESCRIPTOR 0x303
#define DEVICE_QALIFIER_DESCRIPTOR 0x600 #define DEVICE_QALIFIER_DESCRIPTOR 0x600
// EPnR bits manipulation // EPnR bits manipulation
#define CLEAR_DTOG_RX(R) (R & USB_EPnR_DTOG_RX) ? R : (R & (~USB_EPnR_DTOG_RX)) #define CLEAR_DTOG_RX(R) (R & USB_EPnR_DTOG_RX) ? R : (R & (~USB_EPnR_DTOG_RX))
#define SET_DTOG_RX(R) (R & USB_EPnR_DTOG_RX) ? (R & (~USB_EPnR_DTOG_RX)) : R #define SET_DTOG_RX(R) (R & USB_EPnR_DTOG_RX) ? (R & (~USB_EPnR_DTOG_RX)) : R
#define TOGGLE_DTOG_RX(R) (R | USB_EPnR_DTOG_RX) #define TOGGLE_DTOG_RX(R) (R | USB_EPnR_DTOG_RX)
#define KEEP_DTOG_RX(R) (R & (~USB_EPnR_DTOG_RX)) #define KEEP_DTOG_RX(R) (R & (~USB_EPnR_DTOG_RX))
#define CLEAR_DTOG_TX(R) (R & USB_EPnR_DTOG_TX) ? R : (R & (~USB_EPnR_DTOG_TX)) #define CLEAR_DTOG_TX(R) (R & USB_EPnR_DTOG_TX) ? R : (R & (~USB_EPnR_DTOG_TX))
#define SET_DTOG_TX(R) (R & USB_EPnR_DTOG_TX) ? (R & (~USB_EPnR_DTOG_TX)) : R #define SET_DTOG_TX(R) (R & USB_EPnR_DTOG_TX) ? (R & (~USB_EPnR_DTOG_TX)) : R
#define TOGGLE_DTOG_TX(R) (R | USB_EPnR_DTOG_TX) #define TOGGLE_DTOG_TX(R) (R | USB_EPnR_DTOG_TX)
#define KEEP_DTOG_TX(R) (R & (~USB_EPnR_DTOG_TX)) #define KEEP_DTOG_TX(R) (R & (~USB_EPnR_DTOG_TX))
#define SET_VALID_RX(R) ((R & USB_EPnR_STAT_RX) ^ USB_EPnR_STAT_RX) | (R & (~USB_EPnR_STAT_RX)) #define SET_VALID_RX(R) ((R & USB_EPnR_STAT_RX) ^ USB_EPnR_STAT_RX) | (R & (~USB_EPnR_STAT_RX))
#define SET_NAK_RX(R) ((R & USB_EPnR_STAT_RX) ^ USB_EPnR_STAT_RX_1) | (R & (~USB_EPnR_STAT_RX)) #define SET_NAK_RX(R) ((R & USB_EPnR_STAT_RX) ^ USB_EPnR_STAT_RX_1) | (R & (~USB_EPnR_STAT_RX))
#define SET_STALL_RX(R) ((R & USB_EPnR_STAT_RX) ^ USB_EPnR_STAT_RX_0) | (R & (~USB_EPnR_STAT_RX)) #define SET_STALL_RX(R) ((R & USB_EPnR_STAT_RX) ^ USB_EPnR_STAT_RX_0) | (R & (~USB_EPnR_STAT_RX))
#define KEEP_STAT_RX(R) (R & (~USB_EPnR_STAT_RX)) #define KEEP_STAT_RX(R) (R & (~USB_EPnR_STAT_RX))
#define SET_VALID_TX(R) ((R & USB_EPnR_STAT_TX) ^ USB_EPnR_STAT_TX) | (R & (~USB_EPnR_STAT_TX)) #define SET_VALID_TX(R) ((R & USB_EPnR_STAT_TX) ^ USB_EPnR_STAT_TX) | (R & (~USB_EPnR_STAT_TX))
#define SET_NAK_TX(R) ((R & USB_EPnR_STAT_TX) ^ USB_EPnR_STAT_TX_1) | (R & (~USB_EPnR_STAT_TX)) #define SET_NAK_TX(R) ((R & USB_EPnR_STAT_TX) ^ USB_EPnR_STAT_TX_1) | (R & (~USB_EPnR_STAT_TX))
#define SET_STALL_TX(R) ((R & USB_EPnR_STAT_TX) ^ USB_EPnR_STAT_TX_0) | (R & (~USB_EPnR_STAT_TX)) #define SET_STALL_TX(R) ((R & USB_EPnR_STAT_TX) ^ USB_EPnR_STAT_TX_0) | (R & (~USB_EPnR_STAT_TX))
#define KEEP_STAT_TX(R) (R & (~USB_EPnR_STAT_TX)) #define KEEP_STAT_TX(R) (R & (~USB_EPnR_STAT_TX))
#define CLEAR_CTR_RX(R) (R & (~USB_EPnR_CTR_RX)) #define CLEAR_CTR_RX(R) (R & (~USB_EPnR_CTR_RX))
#define CLEAR_CTR_TX(R) (R & (~USB_EPnR_CTR_TX)) #define CLEAR_CTR_TX(R) (R & (~USB_EPnR_CTR_TX))
#define CLEAR_CTR_RX_TX(R) (R & (~(USB_EPnR_CTR_TX | USB_EPnR_CTR_RX))) #define CLEAR_CTR_RX_TX(R) (R & (~(USB_EPnR_CTR_TX | USB_EPnR_CTR_RX)))
// USB state: uninitialized, addressed, ready for use // USB state: uninitialized, addressed, ready for use
#define USB_DEFAULT_STATE 0 #define USB_DEFAULT_STATE 0
#define USB_ADRESSED_STATE 1 #define USB_ADRESSED_STATE 1
#define USB_CONFIGURE_STATE 2 #define USB_CONFIGURE_STATE 2
// EP types // EP types
#define EP_TYPE_BULK 0x00 #define EP_TYPE_BULK 0x00
#define EP_TYPE_CONTROL 0x01 #define EP_TYPE_CONTROL 0x01
#define EP_TYPE_ISO 0x02 #define EP_TYPE_ISO 0x02
#define EP_TYPE_INTERRUPT 0x03 #define EP_TYPE_INTERRUPT 0x03
#define LANG_US (uint16_t)0x0409 #define LANG_US (uint16_t)0x0409
#define _USB_STRING_(name, str) \ #define _USB_STRING_(name, str) \
static const struct name \ static const struct name \
{ \ { \
uint8_t bLength; \ uint8_t bLength; \
uint8_t bDescriptorType; \ uint8_t bDescriptorType; \
uint16_t bString[(sizeof(str) - 2) / 2]; \ uint16_t bString[(sizeof(str) - 2) / 2]; \
\ \
} \ } \
name = {sizeof(name), 0x03, str}; name = {sizeof(name), 0x03, str};
#define _USB_LANG_ID_(lng_id) \ #define _USB_LANG_ID_(lng_id) \
\ \
static const struct USB_StringLangDescriptor \ static const struct USB_StringLangDescriptor \
{ \ { \
uint8_t bLength; \ uint8_t bLength; \
uint8_t bDescriptorType; \ uint8_t bDescriptorType; \
uint16_t bString; \ uint16_t bString; \
\ \
} \ } \
USB_StringLangDescriptor = {0x04, 0x03, lng_id}; USB_StringLangDescriptor = {0x04, 0x03, lng_id};
// EP0 configuration packet // EP0 configuration packet
typedef struct { typedef struct {
uint8_t bmRequestType; uint8_t bmRequestType;
uint8_t bRequest; uint8_t bRequest;
uint16_t wValue; uint16_t wValue;
uint16_t wIndex; uint16_t wIndex;
uint16_t wLength; uint16_t wLength;
} config_pack_t; } config_pack_t;
// endpoints state // endpoints state
typedef struct __ep_t{ typedef struct __ep_t{
uint16_t *tx_buf; uint16_t *tx_buf;
uint8_t *rx_buf; uint8_t *rx_buf;
uint16_t (*func)(); uint16_t (*func)();
uint16_t status; uint16_t status;
unsigned rx_cnt : 10; unsigned rx_cnt : 10;
unsigned tx_flag : 1; unsigned tx_flag : 1;
unsigned rx_flag : 1; unsigned rx_flag : 1;
unsigned setup_flag : 1; unsigned setup_flag : 1;
} ep_t; } ep_t;
// USB status & its address // USB status & its address
typedef struct { typedef struct {
uint8_t USB_Status; uint8_t USB_Status;
uint16_t USB_Addr; uint16_t USB_Addr;
}usb_dev_t; }usb_dev_t;
typedef struct { typedef struct {
uint32_t dwDTERate; uint32_t dwDTERate;
uint8_t bCharFormat; uint8_t bCharFormat;
#define USB_CDC_1_STOP_BITS 0 #define USB_CDC_1_STOP_BITS 0
#define USB_CDC_1_5_STOP_BITS 1 #define USB_CDC_1_5_STOP_BITS 1
#define USB_CDC_2_STOP_BITS 2 #define USB_CDC_2_STOP_BITS 2
uint8_t bParityType; uint8_t bParityType;
#define USB_CDC_NO_PARITY 0 #define USB_CDC_NO_PARITY 0
#define USB_CDC_ODD_PARITY 1 #define USB_CDC_ODD_PARITY 1
#define USB_CDC_EVEN_PARITY 2 #define USB_CDC_EVEN_PARITY 2
#define USB_CDC_MARK_PARITY 3 #define USB_CDC_MARK_PARITY 3
#define USB_CDC_SPACE_PARITY 4 #define USB_CDC_SPACE_PARITY 4
uint8_t bDataBits; uint8_t bDataBits;
} __attribute__ ((packed)) usb_LineCoding; } __attribute__ ((packed)) usb_LineCoding;
typedef struct { typedef struct {
uint8_t bmRequestType; uint8_t bmRequestType;
uint8_t bNotificationType; uint8_t bNotificationType;
uint16_t wValue; uint16_t wValue;
uint16_t wIndex; uint16_t wIndex;
uint16_t wLength; uint16_t wLength;
} __attribute__ ((packed)) usb_cdc_notification; } __attribute__ ((packed)) usb_cdc_notification;
extern uint8_t setlinecoding; extern uint8_t setlinecoding;
#define SETLINECODING() (setlinecoding) #define SETLINECODING() (setlinecoding)
#define CLRLINECODING() do{setlinecoding = 0;}while(0) #define CLRLINECODING() do{setlinecoding = 0;}while(0)
void USB_Init(); void USB_Init();
uint8_t USB_GetState(); uint8_t USB_GetState();
void EP_Init(uint8_t number, uint8_t type, uint16_t addr_tx, uint16_t addr_rx, uint16_t (*func)(ep_t ep)); void EP_Init(uint8_t number, uint8_t type, uint16_t addr_tx, uint16_t addr_rx, uint16_t (*func)(ep_t ep));
void EP_WriteIRQ(uint8_t number, const uint8_t *buf, uint16_t size); 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); void EP_Write(uint8_t number, const uint8_t *buf, uint16_t size);
int EP_Read(uint8_t number, uint8_t *buf); int EP_Read(uint8_t number, uint8_t *buf);
usb_LineCoding getLineCoding(); usb_LineCoding getLineCoding();
void WEAK linecoding_handler(usb_LineCoding *lc); void WEAK linecoding_handler(usb_LineCoding *lc);
void WEAK clstate_handler(uint16_t val); void WEAK clstate_handler(uint16_t val);
void WEAK break_handler(); void WEAK break_handler();
void WEAK vendor_handler(config_pack_t *packet); void WEAK vendor_handler(config_pack_t *packet);
#endif // __USB_LIB_H__ #endif // __USB_LIB_H__

2
F1-nolib/F1_testbrd/usb_lib.c
View File

@ -307,7 +307,7 @@ static uint16_t EP0_Handler(ep_t ep){
} }
}else if (ep.rx_flag){ // got data over EP0 or host acknowlegement }else if (ep.rx_flag){ // got data over EP0 or host acknowlegement
if(ep.rx_cnt){ if(ep.rx_cnt){
EP_WriteIRQ(0, (uint8_t *)0, 0); // EP_WriteIRQ(0, (uint8_t *)0, 0);
if(setup_packet.bRequest == SET_LINE_CODING){ if(setup_packet.bRequest == SET_LINE_CODING){
linecoding_handler((usb_LineCoding*)ep0databuf); linecoding_handler((usb_LineCoding*)ep0databuf);
} }

2
F1-nolib/chronometer/usb_lib.c
View File

@ -307,7 +307,7 @@ static uint16_t EP0_Handler(ep_t ep){
} }
}else if (ep.rx_flag){ // got data over EP0 or host acknowlegement }else if (ep.rx_flag){ // got data over EP0 or host acknowlegement
if(ep.rx_cnt){ if(ep.rx_cnt){
EP_WriteIRQ(0, (uint8_t *)0, 0); // EP_WriteIRQ(0, (uint8_t *)0, 0);
if(setup_packet.bRequest == SET_LINE_CODING){ if(setup_packet.bRequest == SET_LINE_CODING){
linecoding_handler((usb_LineCoding*)ep0databuf); linecoding_handler((usb_LineCoding*)ep0databuf);
} }