CHCh Upgrade: Improved FTDI and CP210x support, add PL2303 support, bugfixes #2488

IngHK · 2024-02-22T20:20:30Z

This PR is the kick-off of the series of single commits, which should result in the following improvements:

Improved support of FTDI: support of all popular types (B/R/H, single and multiple channels), support of set line coding, data format, baudrate, line state
Improved support of CP210x: support of set line coding, data format, baudrate, line state
Added PL2303 support
Added continuation of enumeration after TU_ASSERT
Bugfix CH34x ch34x_set_line_coding() callback bug #2448 and several other bugfixes

I think, it's easier to review the changes commit for commit.
After review of each commit, I'll implement and commit it together with the next improvement.
So this PR should be first merged to master at the end.
OK?

hathach · 2024-02-23T18:15:21Z

@IngHK thank you, though don't worry too much about the number of commits etc, just make it convenient for you. I don't always have time to review things (pending PRs is already long enough), but small change is indeed easier to review. So just group thing together as long as you think that make sense. The current PR only update comment, do you have anything to push more or you want to merge this as it is.

… and Helper. no functional changes

IngHK · 2024-02-23T22:34:26Z

@IngHK thank you, though don't worry too much about the number of commits etc, just make it convenient for you. I don't always have time to review things (pending PRs is already long enough), but small change is indeed easier to review. So just group thing together as long as you think that make sense. The current PR only update comment, do you have anything to push more or you want to merge this as it is.

Yes, I know, the first commit is pretty small, only to warm up ;-)
The next commit sorts the diver functions into the sections Control Request, Driver API, Enumeration and Helper like the CH34x.
There are no functional changes, only code movement.

IngHK · 2024-02-23T22:47:59Z

The last commit improves the TU_LOGs.
It standardizes the logs with a uniform beginning "[:dadr:itf_num] CHCh drivername ...".
And it moves the logs from the driver to the common cdc section.
Here an example output:

I think these are commits that need to be reviewed first.
After the review and, if necessary, my follow-up work, I will push further commits

hathach · 2024-02-24T10:24:01Z

@IngHK I appreciated your effor to break it out, but please push everything you think work best. Otherwise this make take several months to complete this whole process. I would like to merge portion of code once it is reviewed, and I may only have time to review this 1 or 2 times a month or so. Last time, I could focus on the PR since I need to get ch34x driver running for another paid works.

…trol_complete() and moved them into driver's sections. no functional change

… value 0 is also valid

…mplete() to be reused by FTDI & CP210x

IngHK · 2024-02-24T12:08:51Z

@hathach OK, no problem, we'll do it the way that suits you best.
Now I've pushed everything.
I'm currently writing a small test suite to do the tests with hardware.

IngHK · 2024-02-24T12:16:40Z

src/class/cdc/cdc_host.c

@@ -422,127 +421,6 @@ bool tuh_cdc_read_clear (uint8_t idx) {
 // Control Endpoint API
 //--------------------------------------------------------------------+

-static void process_internal_control_complete(tuh_xfer_t* xfer, uint8_t itf_num) {


The intention here was to move the driver-specific code parts into the driver sections so that the general CDC section does not contain any driver code (as possible).
In addition, cdch_internal_control_complete() had become quite bloated and confusing.

IngHK · 2024-02-24T12:25:14Z

src/class/cdc/cdc_host.c

-  bool (*const set_baudrate)(cdch_interface_t* p_cdc, uint32_t baudrate, tuh_xfer_cb_t complete_cb, uintptr_t user_data);
-  bool (*const set_data_format)(cdch_interface_t* p_cdc, uint8_t stop_bits, uint8_t parity, uint8_t data_bits, tuh_xfer_cb_t complete_cb, uintptr_t user_data);
-  bool (*const set_line_coding)(cdch_interface_t* p_cdc, cdc_line_coding_t const* line_coding, tuh_xfer_cb_t complete_cb, uintptr_t user_data);
+  bool (*const set_baudrate)(cdch_interface_t* p_cdc, tuh_xfer_cb_t complete_cb, uintptr_t user_data);


The intention here was to simplify the parameter passing of the Control Endpoint API calls to the driver functions.
p_cdc->requested_line_coding was already available for FTDI, CP210X and CH34X anyway.
And it makes the internal control complete functions safe and easy.

IngHK · 2024-02-24T12:36:14Z

src/class/cdc/cdc_host.c

@@ -421,115 +421,101 @@ bool tuh_cdc_read_clear (uint8_t idx) {
 // Control Endpoint API
 //--------------------------------------------------------------------+

-bool tuh_cdc_set_control_line_state(uint8_t idx, uint16_t line_state, tuh_xfer_cb_t complete_cb, uintptr_t user_data) {


Since the central flow code of tuh_cdc_set_control_line_state(), tuh_cdc_set_baudrate(), tuh_cdc_set_data_format() and tuh_cdc_set_line_coding() is identical and very tricky, it was outsourced to the common subfunction set_function_call(), which calls the regarding driver's function.
Here you see, why I moved (among other things) the requested line coding and line state into p_cdc->requested..., because it also simplifies the parameter transfer from Control Endpoint API to Driver API independent of the upper mentoined API functions

IngHK · 2024-02-24T12:40:08Z

src/class/cdc/cdc_host.c

-  TU_LOG_P_CDC("set config complete");
-  p_cdc->mounted = true;
-  if (tuh_cdc_mount_cb) tuh_cdc_mount_cb(idx);
+static void set_config_complete(uint8_t idx, uint8_t itf_offset, bool success) {


now the enumeration will continue, even if a process config fails

HiFiPhile · 2024-02-25T11:30:11Z

src/class/cdc/cdc_host.c

+static uint16_t const pl2303_vid_pid_list[][2] = {CFG_TUH_CDC_PL2303_VID_PID_LIST};
+static const struct pl2303_type_data pl2303_type_data[TYPE_COUNT] = {PL2303_TYPE_DATA};
+
+CFG_TUH_MEM_SECTION CFG_TUH_MEM_ALIGN


IAR built fail is due to this extra statement.

IngHK · 2024-02-27T14:32:24Z

src/class/cdc/cdc_host.c

-  // TODO not implemented yet
-  return false;
+static void ftdi_set_line_coding_stage1_complete(tuh_xfer_t * xfer) {
+  uint8_t const itf_num = (uint8_t) tu_le16toh(xfer->setup->wIndex);


here is a bug.
will be fixed in a subsequent commit.

hathach · 2024-02-28T08:01:32Z

thank you very much, I wil review this whenever I could.

…OL_ON_ENUM

IngHK · 2024-03-14T12:16:38Z

If it's easier for you than one huge PR, then I can split it up into smaller PRs that only contain individual and self-contained feature changes

IngHK · 2024-04-04T12:18:39Z

OK. I finished work for now.
It's ready for review and merge

hathach · 2024-04-08T04:17:20Z

thank you, please give me a bit of time to review.

heikokue added 2 commits February 13, 2024 14:14

improved tusb_config.h comment

b9c44ee

Merge remote-tracking branch 'remotes/hathach/master' into cdch_upgrade

ab6b9e3

sorted driver functions into Control Request, Driver API, Enumeration…

069c68a

… and Helper. no functional changes

improved TU_LOGs

47777a6

heikokue added 17 commits February 24, 2024 12:57

splitted cdch_internal_control_complete() into driver's _internal_con…

829ea52

…trol_complete() and moved them into driver's sections. no functional change

changed to use of p_cdc->requested_line_coding

2f50f5a

changed to use of p_cdc->requested_line_state

7dd435c

created set_function_call()

dcadf8c

added continue enum after config fail

ea86bbe

improved ACM checks

22a12c7

fixed hathach#2448 CH34x ch34x_set_line_coding() callback bug

138567a

fixed CFG_TUH_CDC_LINE_CONTROL_ON_ENUM handling. only set if defined.…

db511fb

… value 0 is also valid

created set_line_coding_sequence() and void set_line_coding_stage1_co…

0b5f85e

…mplete() to be reused by FTDI & CP210x

improved FTDI support

7fef594

improved CP210x support

4547737

added PL2303 support

aabee25

updated contribution, readme and some comments

ea175a7

small changes & code style

2b507db

improved TU_LOGs

da93fcf

improved PL2303 TU_LOGs

46a861b

Merge remote-tracking branch 'remotes/hathach/master' into cdch_upgrade

af5e75c

IngHK commented Feb 24, 2024

View reviewed changes

HiFiPhile reviewed Feb 25, 2024

View reviewed changes

IngHK commented Feb 27, 2024

View reviewed changes

IngHK mentioned this pull request Feb 29, 2024

Update Code for Class Vendor_Host #1097

Open

heikokue added 12 commits February 29, 2024 10:45

Merge remote-tracking branch 'remotes/hathach/master' into cdch_upgrade

7f7576f

FTDI fixed itf_num and some improvement

f97e312

improved & fixed compiler warnings device descriptor handling

d3d61da

removed expendable ACM check

edf1320

small PL2303 improvements

3cf9cb9

improved TU_LOGs

e7308e3

fixed IAR compile error

e6d27b6

added explicite (uint16_t) casts inside tu_htole16()

dea27d2

added use of cdc_line_control_state_t type in CDCh

e055104

added line control function using cdc_line_control_state_t

a9cc07f

added defines CFG_TUH_CDC_DTR_CONTROL_ON_ENUM & CFG_TUH_CDC_RTS_CONTR…

ee92e58

…OL_ON_ENUM

fixed FTDI set control line

2786a61

heikokue added 10 commits March 21, 2024 08:29

code style and clean up CDC serial header files

cb69ed0

Merge remote-tracking branch 'remotes/hathach/master' into work

1bbd658

Merge remote-tracking branch 'remotes/hathach/master' into cdch_upgrade

e2a5630

fixed compile warnings

5e67b92

CP210x removed baudrate check, fixed data bits check

e07ee4a

foxed FTDI flow control config

a1b1c1f

disable PL2303 flow control config

e02a309

small change process config complete

68602e4

updated doc

0c5e14c

Merge remote-tracking branch 'remotes/hathach/master' into cdch_upgrade

f00e698

hathach added the Prio Higher label Aug 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CHCh Upgrade: Improved FTDI and CP210x support, add PL2303 support, bugfixes #2488

CHCh Upgrade: Improved FTDI and CP210x support, add PL2303 support, bugfixes #2488

IngHK commented Feb 22, 2024

hathach commented Feb 23, 2024

IngHK commented Feb 23, 2024

IngHK commented Feb 23, 2024

hathach commented Feb 24, 2024

IngHK commented Feb 24, 2024

IngHK Feb 24, 2024

IngHK Feb 24, 2024

IngHK Feb 24, 2024 •

edited

Loading

IngHK Feb 24, 2024

HiFiPhile Feb 25, 2024

IngHK Feb 27, 2024

hathach commented Feb 28, 2024

IngHK commented Mar 14, 2024

IngHK commented Apr 4, 2024

hathach commented Apr 8, 2024

CHCh Upgrade: Improved FTDI and CP210x support, add PL2303 support, bugfixes #2488

Are you sure you want to change the base?

CHCh Upgrade: Improved FTDI and CP210x support, add PL2303 support, bugfixes #2488

Conversation

IngHK commented Feb 22, 2024

hathach commented Feb 23, 2024

IngHK commented Feb 23, 2024

IngHK commented Feb 23, 2024

hathach commented Feb 24, 2024

IngHK commented Feb 24, 2024

IngHK Feb 24, 2024

Choose a reason for hiding this comment

IngHK Feb 24, 2024

Choose a reason for hiding this comment

IngHK Feb 24, 2024 • edited Loading

Choose a reason for hiding this comment

IngHK Feb 24, 2024

Choose a reason for hiding this comment

HiFiPhile Feb 25, 2024

Choose a reason for hiding this comment

IngHK Feb 27, 2024

Choose a reason for hiding this comment

hathach commented Feb 28, 2024

IngHK commented Mar 14, 2024

IngHK commented Apr 4, 2024

hathach commented Apr 8, 2024

IngHK Feb 24, 2024 •

edited

Loading