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

OpenTitan: Add support for detecting the USB device #2080

Merged
merged 16 commits into from
Sep 10, 2020
Merged

OpenTitan: Add support for detecting the USB device #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2957d62
chips/lowrisc: usbdev: Fixup some mistakes in the register layout
alistair23 Aug 19, 2020
9ac6176
chips/lowrisc: usbdev: Remove debug prints
alistair23 Aug 19, 2020
6013c2e
chips/lowrisc: usbdev: Ensure the free_buffer() function frees a buffer
alistair23 Aug 20, 2020
8738d85
chips/lowrisc: usbdev: Add the SetupRequest enum
alistair23 Jul 21, 2020
aa9b782
chips/lowrisc: usbdev: Add the stall function
alistair23 Jul 21, 2020
0614468
chips/lowrisc: usbdev: Add some more helper functions
alistair23 Jul 21, 2020
f5066c7
chips/lowrisc: usbdev: Fixup the CtrlState options
alistair23 Aug 19, 2020
ddf78fb
chips/lowrisc: usbdev: Add support for setting the address
alistair23 Aug 19, 2020
aff69ac
chips/lowrisc: usbdev: Add the control_ep_receive() function
alistair23 Jul 21, 2020
eced868
chips/lowrisc: usbdev: Add support for calling ctrl_out()
alistair23 Aug 20, 2020
de23b94
chips/lowrisc: usbdev: Add functionality to the interrupt handler
alistair23 Aug 19, 2020
79b6c55
chips/lowrisc: usbdev: Wait until ACK is sent before changing address
alistair23 Aug 20, 2020
fa5161e
boards/opentitan: Create the USB CDC Component
alistair23 Aug 19, 2020
6f1ea6b
chips/lowrisc: usbdev: Consolidate the Bulk Endpoint types
alistair23 Sep 3, 2020
6729b1c
chips/lowrisc: usbdev: Support receive on non-zero Endpoints
alistair23 Sep 3, 2020
5bfcadd
chips/lowrisc: usbdev: Add support for endpoint_resume_in()
alistair23 Sep 3, 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
30 changes: 28 additions & 2 deletions boards/opentitan/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use kernel::component::Component;
use kernel::hil;
use kernel::hil::i2c::I2CMaster;
use kernel::hil::time::Alarm;
use kernel::hil::usb::Client;
use kernel::Chip;
use kernel::Platform;
use kernel::{create_capability, debug, static_init};
Expand Down Expand Up @@ -256,8 +257,6 @@ pub unsafe fn reset_handler() {
[u8; 32]
));

let usb = usb::UsbComponent::new(board_kernel).finalize(());

let i2c_master = static_init!(
capsules::i2c_master::I2CMasterDriver<lowrisc::i2c::I2c<'static>>,
capsules::i2c_master::I2CMasterDriver::new(
Expand All @@ -269,6 +268,33 @@ pub unsafe fn reset_handler() {

earlgrey::i2c::I2C.set_master_client(i2c_master);

let usb = usb::UsbComponent::new(board_kernel).finalize(());

// Create the strings we include in the USB descriptor.
let strings = static_init!(
[&str; 3],
[
"LowRISC.", // Manufacturer
"OpenTitan - TockOS", // Product
"18d1:503a", // Serial number
]
);

let cdc = components::cdc::CdcAcmComponent::new(
&earlgrey::usbdev::USB,
capsules::usb::cdc::MAX_CTRL_PACKET_SIZE_NRF52840,
0x18d1, // 0x18d1 Google Inc.
0x503a, // lowRISC generic FS USB
strings,
)
.finalize(components::usb_cdc_acm_component_helper!(
lowrisc::usbdev::Usb
));

// Configure the USB stack to enable a serial port over CDC-ACM.
cdc.enable();
cdc.attach();

debug!("OpenTitan initialisation complete. Entering main loop");

/// These symbols are defined in the linker script.
Expand Down