Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2025-08-15 01:45:40 -04:00
Code Issues Projects Releases Packages Wiki Activity

ch552: Misc. cleanup

Browse source 
- Merge Makefile and Makefile.include into Makefile
  - Format structure
  - Remove unused variables, targets etc.

- Add missing check if it is ok to send data to the FPGA.

- Remove 'baud rate calculator.ods'

- Update encode_usb_strings.py to generate strings for
  CdcCtrlInterfaceDesc, CdcDataInterfaceDesc,
  FidoHidInterfaceDesc, TkeyCtrlInterfaceDesc.
  Also store generated strings in UTF-16 instead of hex.

- Update usb_strings.h to match new encode_usb_strings.py
  output.

- Remove unused struct SetupReqBuf.
This commit is contained in:
Jonas Thörnblad 2025-03-13 14:32:59 +01:00
parent 33f14122ad
commit 8d8f4c7faf
No known key found for this signature in database
GPG key ID: 2D318AD00A326F95
7 changed files with 126 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

18
hw/usb_interface/ch552_fw/include/usb_strings.h
View file

@ -3,22 +3,22 @@
#include "mem.h"
unsigned char FLASH ProdDesc[]={ // "MTA1-USB-V1"
unsigned char FLASH ProdDesc[] = { // "MTA1-USB-V1"
24, // Length of this descriptor (in bytes)
0x03, // Descriptor type (String)
'M', 0, 'T', 0, 'A', 0, '1', 0,
'-', 0, 'U', 0, 'S', 0, 'B', 0,
'-', 0, 'V', 0, '1', 0
'-', 0, 'V', 0, '1', 0,
};
unsigned char FLASH ManufDesc[]={ // "Tillitis"
unsigned char FLASH ManufDesc[] = { // "Tillitis"
18, // Length of this descriptor (in bytes)
0x03, // Descriptor type (String)
'T', 0, 'i', 0, 'l', 0, 'l', 0,
'i', 0, 't', 0, 'i', 0, 's', 0
'i', 0, 't', 0, 'i', 0, 's', 0,
};
unsigned char FLASH SerialDesc[]={ // "68de5d27-e223-4874-bc76-a54d6e84068f"
unsigned char FLASH SerialDesc[] = { // "68de5d27-e223-4874-bc76-a54d6e84068f"
74, // Length of this descriptor (in bytes)
0x03, // Descriptor type (String)
'6', 0, '8', 0, 'd', 0, 'e', 0,
@ -32,28 +32,28 @@ unsigned char FLASH SerialDesc[]={ // "68de5d27-e223-4874-bc76-a54d6e84068f"
'0', 0, '6', 0, '8', 0, 'f', 0,
};
unsigned char FLASH CdcCtrlInterfaceDesc[] = {
unsigned char FLASH CdcCtrlInterfaceDesc[] = { // "CDC-Ctrl"
18, // Length of this descriptor (in bytes)
0x03, // Descriptor type (String)
'C', 0, 'D', 0, 'C', 0, '-', 0,
'C', 0, 't', 0, 'r', 0, 'l', 0,
};
unsigned char FLASH CdcDataInterfaceDesc[] = {
unsigned char FLASH CdcDataInterfaceDesc[] = { // "CDC-Data"
18, // Length of this descriptor (in bytes)
0x03, // Descriptor type (String)
'C', 0, 'D', 0, 'C', 0, '-', 0,
'D', 0, 'a', 0, 't', 0, 'a', 0,
};
unsigned char FLASH FidoHidInterfaceDesc[] = {
unsigned char FLASH FidoHidInterfaceDesc[] = { // "FIDO-HID"
18, // Length of this descriptor (in bytes)
0x03, // Descriptor type (String)
'F', 0, 'I', 0, 'D', 0, 'O', 0,
'-', 0, 'H', 0, 'I', 0, 'D', 0,
};
unsigned char FLASH TkeyCtrlInterfaceDesc[] = {
unsigned char FLASH TkeyCtrlInterfaceDesc[] = { // "TKEY-Ctrl"
20, // Length of this descriptor (in bytes)
0x03, // Descriptor type (String)
'T', 0, 'K', 0, 'E', 0, 'Y', 0,