Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

USB: Add CDC support, update capsule stack #1902

Merged
merged 44 commits into from
Jun 15, 2020
Merged

USB: Add CDC support, update capsule stack #1902

Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
3c5ca90
sam4l: usb: handle `OkSetAddress` return code
bradjc May 29, 2020
85ef795
sam4l: usb: ensure buffers are at least 8 bytes
bradjc May 29, 2020
76b01b7
sam4l: usb: update check for buffer full
bradjc May 29, 2020
fb9f34a
start on cdc
bradjc May 29, 2020
ca41d09
update imix to use cdc
bradjc May 29, 2020
cc060d3
setup some descriptors for cdc
bradjc May 29, 2020
543e62d
capsules: usb: update to array of interface descriptors
bradjc Jun 1, 2020
a7d12c3
Remove interface response for get descriptor
brghena Jun 1, 2020
593c8cc
Consolidate creation of descriptor buffers
brghena Jun 1, 2020
95eda8b
actually copy data
bradjc Jun 1, 2020
080c62e
cdc: fix interface number
bradjc Jun 1, 2020
7b52405
start on cdc descriptor
bradjc Jun 1, 2020
d4485ec
shrink size, makes it fit
bradjc Jun 1, 2020
45e0a5d
cdc full descriptor, showing up
bradjc Jun 1, 2020
e05918c
cdc echo works
bradjc Jun 1, 2020
976c024
trying to impl uart:tx, but lifetime errors
bradjc Jun 1, 2020
6c5458a
rustfmt + fix lifetime issues
hudson-ayers Jun 1, 2020
6a68da1
try to get cdc working on nrf
bradjc Jun 1, 2020
0b72401
cdc: set max pkt size to 64
bradjc Jun 1, 2020
d42eaf2
nrf52840dk: attempt to support CTRL WRITE
bradjc Jun 1, 2020
61d4074
update imix to compile
bradjc Jun 1, 2020
c2cc66f
impl uart for cdc (not done yet)
bradjc Jun 1, 2020
21680f6
cdc: make max packet size a variable
bradjc Jun 1, 2020
2e12523
cdc: impl UartData for CDC
bradjc Jun 1, 2020
c6ceda5
imix: use cdc for console
bradjc Jun 1, 2020
ed6ae94
imix do not use userspace usb app
bradjc Jun 2, 2020
80cea17
sam4l: usb: dont just queue resume in
bradjc Jun 2, 2020
025cb54
usb: cdc: implement uart.receive
bradjc Jun 2, 2020
46bdfe2
nrf52dk: usb: fmt
bradjc Jun 2, 2020
5b62789
imix fmt
bradjc Jun 2, 2020
1b3d983
nrf52: usb: fmt
bradjc Jun 2, 2020
33c8f59
sam4l: usb: fmt
bradjc Jun 2, 2020
3b23cf3
capsules: usb: cleanup
bradjc Jun 2, 2020
f26dde9
capsules: usb: update to flexible packet len
bradjc Jun 2, 2020
ac62f2f
revert chip/board specific code for usb updates
bradjc Jun 2, 2020
2510e9a
capsules: usb: fmt
bradjc Jun 2, 2020
2e8b9ad
imix: update to new usb_client
bradjc Jun 2, 2020
88329a4
opentitan: update to new USB interface
bradjc Jun 2, 2020
6f97ca6
capsules: usb: cdc updates and renaming
bradjc Jun 3, 2020
8d11802
capsules: USB: fix descriptor settings
bradjc Jun 5, 2020
0fbed0a
capsules: usbc_client_ctrl: improve comment
bradjc Jun 5, 2020
a9dc634
capsules: usbc_client_ctrl: clarify comment
bradjc Jun 5, 2020
3f2a466
capsules: usbc_client_ctrl: rename packed to serialization
bradjc Jun 5, 2020
7d2c901
capsules: usbc_client_ctrl: also update comment here
bradjc Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion boards/imix/src/imix_components/usb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ impl Component for UsbComponent {
// Configure the USB controller
let usb_client = static_init!(
capsules::usb::usbc_client::Client<'static, sam4l::usbc::Usbc<'static>>,
capsules::usb::usbc_client::Client::new(&sam4l::usbc::USBC)
capsules::usb::usbc_client::Client::new(
&sam4l::usbc::USBC,
capsules::usb::usbc_client::MAX_CTRL_PACKET_SIZE_SAM4L
)
);
sam4l::usbc::USBC.set_client(usb_client);

Expand Down
5 changes: 4 additions & 1 deletion boards/opentitan/src/usb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ impl Component for UsbComponent {
// Configure the USB controller
let usb_client = static_init!(
capsules::usb::usbc_client::Client<'static, lowrisc::usbdev::Usb<'static>>,
capsules::usb::usbc_client::Client::new(&ibex::usbdev::USB)
capsules::usb::usbc_client::Client::new(
&ibex::usbdev::USB,
capsules::usb::usbc_client::MAX_CTRL_PACKET_SIZE_IBEX
)
);

// Configure the USB userspace driver
Expand Down