diff options
author | Luke T. Shumaker <lukeshu@lukeshu.com> | 2024-09-27 17:25:36 -0600 |
---|---|---|
committer | Luke T. Shumaker <lukeshu@lukeshu.com> | 2024-09-27 17:25:36 -0600 |
commit | e5e15c04bc58c34906e6d7cfcbad68d1a5617563 (patch) | |
tree | 580f5fb0fafc7e974c969fc8aae229205c836195 /cmd | |
parent | 71e1a86a033c380f85dd300d788af63bfef25bab (diff) |
wip
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/sbc_harness/CMakeLists.txt | 23 | ||||
-rw-r--r-- | cmd/sbc_harness/config/config.h | 54 | ||||
-rw-r--r-- | cmd/sbc_harness/config/tusb_config.h | 107 | ||||
-rw-r--r-- | cmd/sbc_harness/main.c (renamed from cmd/harness/main.c) | 0 | ||||
-rw-r--r-- | cmd/sbc_harness/usb_keyboard.c (renamed from cmd/harness/usb_keyboard.c) | 0 | ||||
-rw-r--r-- | cmd/sbc_harness/usb_keyboard.h (renamed from cmd/harness/usb_keyboard.h) | 0 | ||||
-rw-r--r-- | cmd/srv9p/CMakeLists.txt | 15 | ||||
l--------- | cmd/srv9p/config/config.h | 1 |
8 files changed, 200 insertions, 0 deletions
diff --git a/cmd/sbc_harness/CMakeLists.txt b/cmd/sbc_harness/CMakeLists.txt new file mode 100644 index 0000000..34f6360 --- /dev/null +++ b/cmd/sbc_harness/CMakeLists.txt @@ -0,0 +1,23 @@ +# cmd/sbc_harness/CMakeLists.txt - Build script for main sbc_harness.uf2 firmware file +# +# Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com> +# SPDX-Licence-Identifier: AGPL-3.0-or-later + +add_executable(sbc_harness + main.c + usb_keyboard.c +) +target_include_directories(sbc_harness PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config) +target_link_libraries(sbc_harness + pico_stdlib + pico_unique_id + tinyusb_device + tinyusb_board + libusb +) +pico_enable_stdio_usb(sbc_harness 0) +pico_enable_stdio_uart(sbc_harness 1) +pico_enable_stdio_semihosting(sbc_harness 0) +pico_enable_stdio_rtt(sbc_harness 0) +pico_add_extra_outputs(sbc_harness) # create .map/.bin/.hex/.uf2 files in addition to .elf +pico_set_program_url(sbc_harness "https://git.lukeshu.com/sbc-harness") diff --git a/cmd/sbc_harness/config/config.h b/cmd/sbc_harness/config/config.h new file mode 100644 index 0000000..0f0385b --- /dev/null +++ b/cmd/sbc_harness/config/config.h @@ -0,0 +1,54 @@ +/* config.h - Compile-time configuration for sbc_harness + * + * Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com> + * SPDX-Licence-Identifier: AGPL-3.0-or-later + */ +#ifndef _CONFIG_H_ +#define _CONFIG_H_ + +/*#include <assert.h>*/ + +#if defined(USE_CONFIG_NETIO_POSIX) || defined(USE_CONFIG_COROUTINE) +# define CONFIG_NETIO_NUM_CONNS 8 +#endif +#ifdef USE_CONFIG_NETIO_POSIX +# define CONFIG_NETIO_ISLINUX 1 /* can we use Linux-kernel-specific fcntls? */ +# define CONFIG_NETIO_NUM_PORTS 1 +#endif + +#ifdef USE_CONFIG_COROUTINE +# define CONFIG_COROUTINE_DEFAULT_STACK_SIZE (8*1024) +# define CONFIG_COROUTINE_MEASURE_STACK 1 /* bool */ +# define CONFIG_COROUTINE_PROTECT_STACK 1 /* bool */ +# define CONFIG_COROUTINE_DEBUG 0 /* bool */ +# define CONFIG_COROUTINE_NUM (1 /* usb_common */ +\ + 1 /* usb_keyboard */ +\ + CONFIG_NETIO_NUM_CONNS /* accept+read */ +\ + (2*CONFIG_NETIO_NUM_CONNS) /* work+write */ ) + /*static_assert((CONFIG_COROUTINE_NUM * CONFIG_COROUTINE_DEFAULT_STACK_SIZE) < (264 * 1024)); */ +#endif + +#ifdef USE_CONFIG_9P +# define CONFIG_9P_PORT 564 + /** + * This max-msg-size is sized so that a Twrite message can return + * 8KiB of data. + * + * This is the same as the default in Plan 9 4e's lib9p; it has the + * comment that "24" is "ample room for Twrite/Rread header + * (iounit)". In fact, the Twrite header is only 23 bytes + * ("size[4] Twrite[1] tag[2] fid[4] offset[8] count[4]") and the + * Rread header is even shorter at 11 bytes ("size[4] Rread[1] + * tag[2] count[4]"), so "24" appears to be the size of the Twrite + * header rounded up to a nice round number. + * + * In older versions of 9P ("9P1"), the max message size was + * defined as part of the protocol specification rather than + * negotiated. In Plan 9 1e it was (8*1024)+128, and was bumped to + * (8*1024)+160 in 2e and 3e. + */ +# define CONFIG_9P_MAX_MSG_SIZE ((8*1024)+24) +# define CONFIG_9P_MAX_ERR_SIZE 128 /* 128 is what Plan 9 4e uses */ +#endif + +#endif /* _CONFIG_H */ diff --git a/cmd/sbc_harness/config/tusb_config.h b/cmd/sbc_harness/config/tusb_config.h new file mode 100644 index 0000000..cb1ca3b --- /dev/null +++ b/cmd/sbc_harness/config/tusb_config.h @@ -0,0 +1,107 @@ +/* tusb_config.h - Compile-time configuration for the TinyUSB library + * + * The MIT License (MIT) + * + * Copyright (c) 2019 Ha Thach (tinyusb.org) + * Copyright (c) 2024 Luke T. Shumaker <lukeshu@lukeshu.com> + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + */ + +#ifndef _TUSB_CONFIG_H_ +#define _TUSB_CONFIG_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +//-------------------------------------------------------------------- +// TinyUSB Device (TUD) initialization for rp2040-based boards +//-------------------------------------------------------------------- + +// Which USB port to use for the RootHub. +// The rp2040 only has 1 port, so it's gotta be port #0. +#define BOARD_TUD_RHPORT 0 + +// RHPort max operational speed. +// Use OPT_MODE_DEFAULT_SPEED for max speed supported by MCU. +#define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED + +//-------------------------------------------------------------------- +// Configuration: common +//-------------------------------------------------------------------- + +// defined by compiler flags +#ifndef CFG_TUSB_MCU +#error CFG_TUSB_MCU must be defined +#endif + +// Conditional because it might be defined with `-D` on the command +// line if `cmake -DCMAKE_BUILD_TYPE=Debug`. +#ifndef CFG_TUSB_DEBUG +#define CFG_TUSB_DEBUG 0 +#endif + +// USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment. +// Tinyusb use follows macros to declare transferring memory so that they can be put +// into those specific section. +// e.g +// - CFG_TUSB_MEM SECTION : __attribute__ (( section(".usb_ram") )) +// - CFG_TUSB_MEM_ALIGN : __attribute__ ((aligned(4))) +#define CFG_TUSB_MEM_SECTION /* blank */ +#define CFG_TUSB_MEM_ALIGN __attribute__ ((aligned(4))) + +#define CFG_TUD_ENABLED 1 +#define CFG_TUD_MAX_SPEED BOARD_TUD_MAX_SPEED + +//-------------------------------------------------------------------- +// Configuration: TinyUSB Device (TUD) +//-------------------------------------------------------------------- + +// control endpoint max packet size (only 8, 16, 32, or 64 are valid) +#define CFG_TUD_ENDPOINT0_SIZE 64 + +// Which of TinyUSB's built-in class drivers to enable. +// +// If a class takes an int, that's the maximum number of interfaces of +// that type that may be listed in the same configuration descriptor. +#define CFG_TUD_CDC 0 // int : Communications Device Class (e.g. ttyUSB) https://www.usb.org/sites/default/files/CDC1.2_WMC1.1_012011.zip +#define CFG_TUD_MSC 0 // bool: Mass Storage Class https://www.usb.org/sites/default/files/Mass_Storage_Specification_Overview_v1.4_2-19-2010.pdf +#define CFG_TUD_HID 1 // int : Human Interface Device https://www.usb.org/sites/default/files/hid1_11.pdf +#define CFG_TUD_AUDIO 0 // int : Audio https://www.usb.org/sites/default/files/audio10.pdf +#define CFG_TUD_VIDEO 0 // int : Video https://www.usb.org/sites/default/files/USB_Video_Class_1_5.zip +#define CFG_TUD_MIDI 0 // int : Musical Instrument Digital Interface https://www.usb.org/sites/default/files/USB%20MIDI%20v2_0.pdf +#define CFG_TUD_VENDOR 0 // int : ??? +#define CFG_TUD_USBTMC 0 // bool: Test & Measurement Class https://www.usb.org/sites/default/files/USBTMC_1_006a.zip +#define CFG_TUD_DFU_RUNTIME 0 // bool: Device Firmware Upgrade https://www.usb.org/sites/default/files/DFU_1.1.pdf +#define CFG_TUD_DFU 0 // bool: Device Firmware Upgrade https://www.usb.org/sites/default/files/DFU_1.1.pdf +#define CFG_TUD_ECM_RNDIS 0 // bool: net +#define CFG_TUD_NCM 0 // bool: net +#define CFG_TUD_BTH 0 // bool: Bluetooth + +// HID buffer size Should be sufficient to hold ID (if any) + Data +#define CFG_TUD_HID_EP_BUFSIZE 8 + +//-------------------------------------------------------------------- +#ifdef __cplusplus +} +#endif + +#endif /* _TUSB_CONFIG_H_ */ diff --git a/cmd/harness/main.c b/cmd/sbc_harness/main.c index 1fd9f8c..1fd9f8c 100644 --- a/cmd/harness/main.c +++ b/cmd/sbc_harness/main.c diff --git a/cmd/harness/usb_keyboard.c b/cmd/sbc_harness/usb_keyboard.c index 1989b35..1989b35 100644 --- a/cmd/harness/usb_keyboard.c +++ b/cmd/sbc_harness/usb_keyboard.c diff --git a/cmd/harness/usb_keyboard.h b/cmd/sbc_harness/usb_keyboard.h index 6b65360..6b65360 100644 --- a/cmd/harness/usb_keyboard.h +++ b/cmd/sbc_harness/usb_keyboard.h diff --git a/cmd/srv9p/CMakeLists.txt b/cmd/srv9p/CMakeLists.txt new file mode 100644 index 0000000..3db8795 --- /dev/null +++ b/cmd/srv9p/CMakeLists.txt @@ -0,0 +1,15 @@ +# cmd/srv9p/CMakeLists.txt - Build script for srv9p test/dev executable +# +# Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com> +# SPDX-Licence-Identifier: AGPL-3.0-or-later + +add_executable(srv9p + main.c +) +target_include_directories(srv9p PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config) +target_link_libraries(srv9p + libcr + libcr_ipc + libnetio + lib9p +) diff --git a/cmd/srv9p/config/config.h b/cmd/srv9p/config/config.h new file mode 120000 index 0000000..2edbd7b --- /dev/null +++ b/cmd/srv9p/config/config.h @@ -0,0 +1 @@ +../../sbc_harness/config/config.h
\ No newline at end of file |