MarcelineVPQandClaude Opus 4.8
6482c79644
The speaker-crackle root cause -- USB-audio OUT endpoint software buffer overflow at 3x the max packet size -- was fixed on the audio branch (de37e00) but never on this branch. Bumping CFG_TUD_AUDIO_FUNC_1_EP_OUT_SW_BUF_SZ from 3x to 16x removes the crackle; verified by A/B tone test (440 Hz) through the DS5 speaker. A faint residual cadence "warble" remains (a separate root cause, not the buffer) and is left for a later pass. Net: one firmware with BOTH native adaptive triggers and a crackle-free speaker. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
151 lines
5.4 KiB
C
151 lines
5.4 KiB
C
/*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2019 Ha Thach (tinyusb.org)
|
|
*
|
|
* 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
|
|
|
|
#ifndef ENABLE_SERIAL
|
|
#define ENABLE_SERIAL 0
|
|
#endif
|
|
|
|
//--------------------------------------------------------------------+
|
|
// Board Specific Configuration
|
|
//--------------------------------------------------------------------+
|
|
|
|
// RHPort number used for device can be defined by board.mk, default to port 0
|
|
#ifndef BOARD_TUD_RHPORT
|
|
#define BOARD_TUD_RHPORT 0
|
|
#endif
|
|
|
|
// RHPort max operational speed can defined by board.mk
|
|
#ifndef BOARD_TUD_MAX_SPEED
|
|
#define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
|
|
#endif
|
|
|
|
//--------------------------------------------------------------------
|
|
// COMMON CONFIGURATION
|
|
//--------------------------------------------------------------------
|
|
|
|
// defined by compiler flags for flexibility
|
|
#ifndef CFG_TUSB_MCU
|
|
#error CFG_TUSB_MCU must be defined
|
|
#endif
|
|
|
|
#ifndef CFG_TUSB_OS
|
|
#define CFG_TUSB_OS OPT_OS_NONE
|
|
#endif
|
|
|
|
#ifndef CFG_TUSB_DEBUG
|
|
#define CFG_TUSB_DEBUG 0
|
|
#endif
|
|
|
|
// Enable Device stack
|
|
#define CFG_TUD_ENABLED 1
|
|
|
|
// Default is max speed that hardware controller could support with on-chip PHY
|
|
#define CFG_TUD_MAX_SPEED BOARD_TUD_MAX_SPEED
|
|
|
|
/* 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)))
|
|
*/
|
|
#ifndef CFG_TUSB_MEM_SECTION
|
|
#define CFG_TUSB_MEM_SECTION
|
|
#endif
|
|
|
|
#ifndef CFG_TUSB_MEM_ALIGN
|
|
#define CFG_TUSB_MEM_ALIGN __attribute__ ((aligned(4)))
|
|
#endif
|
|
|
|
//--------------------------------------------------------------------
|
|
// DEVICE CONFIGURATION
|
|
//--------------------------------------------------------------------
|
|
|
|
#ifndef CFG_TUD_ENDPOINT0_SIZE
|
|
#define CFG_TUD_ENDPOINT0_SIZE 64
|
|
#endif
|
|
|
|
//------------- CLASS -------------//
|
|
#define CFG_TUD_AUDIO 1
|
|
#define CFG_TUD_HID 1
|
|
#define CFG_TUD_CDC ENABLE_SERIAL
|
|
#define CFG_TUD_MSC 0
|
|
#define CFG_TUD_MIDI 0
|
|
#define CFG_TUD_VENDOR 0
|
|
|
|
// HID buffer size Should be sufficient to hold ID (if any) + Data
|
|
#define CFG_TUD_HID_EP_BUFSIZE 64
|
|
|
|
//--------------------------------------------------------------------
|
|
// AUDIO CLASS DRIVER CONFIGURATION
|
|
//--------------------------------------------------------------------
|
|
|
|
#define CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX 4
|
|
|
|
// 16bit data in 16bit slots
|
|
#define CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_RX 2
|
|
#define CFG_TUD_AUDIO_FUNC_1_RESOLUTION_RX 16
|
|
|
|
// Microphone (IN/TX) path: 2-channel, 16-bit
|
|
#define CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX 2
|
|
#define CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_TX 2
|
|
#define CFG_TUD_AUDIO_FUNC_1_RESOLUTION_TX 16
|
|
|
|
// UAC1 Full-Speed endpoint size
|
|
#define CFG_TUD_AUDIO_FUNC_1_SAMPLE_RATE 48000
|
|
#define CFG_TUD_AUDIO_FUNC_1_FORMAT_1_EP_SZ_OUT TUD_AUDIO_EP_SIZE(false, CFG_TUD_AUDIO_FUNC_1_SAMPLE_RATE, CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_RX, CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_RX)
|
|
#define CFG_TUD_AUDIO_FUNC_1_FORMAT_1_EP_SZ_IN TUD_AUDIO_EP_SIZE(false, CFG_TUD_AUDIO_FUNC_1_SAMPLE_RATE, CFG_TUD_AUDIO_FUNC_1_N_BYTES_PER_SAMPLE_TX, CFG_TUD_AUDIO_FUNC_1_N_CHANNELS_TX)
|
|
#define CFG_TUD_AUDIO_FUNC_1_EP_OUT_SZ_MAX CFG_TUD_AUDIO_FUNC_1_FORMAT_1_EP_SZ_OUT
|
|
#define CFG_TUD_AUDIO_FUNC_1_EP_IN_SZ_MAX CFG_TUD_AUDIO_FUNC_1_FORMAT_1_EP_SZ_IN
|
|
|
|
#define CFG_TUD_AUDIO_FUNC_1_EP_OUT_SW_BUF_SZ (16 * CFG_TUD_AUDIO_FUNC_1_EP_OUT_SZ_MAX)
|
|
#define CFG_TUD_AUDIO_FUNC_1_EP_IN_SW_BUF_SZ (4 * CFG_TUD_AUDIO_FUNC_1_EP_IN_SZ_MAX)
|
|
|
|
// Enable OUT EP (speaker) and IN EP (mic)
|
|
#define CFG_TUD_AUDIO_ENABLE_EP_OUT 1
|
|
#define CFG_TUD_AUDIO_ENABLE_EP_IN 1
|
|
|
|
// CDC FIFO size of TX and RX
|
|
#define CFG_TUD_CDC_RX_BUFSIZE 64
|
|
#define CFG_TUD_CDC_TX_BUFSIZE 64
|
|
|
|
// CDC Endpoint transfer buffer size, more is faster
|
|
// Leave it as default size (512 for HS, 64 for FS) unless your host application
|
|
// is able to send ZLP (Zero Length Packet) to terminate transfer !
|
|
#define CFG_TUD_CDC_EP_BUFSIZE 64
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* TUSB_CONFIG_H_ */
|