Skip to content

usb_cdc: store TX ring buffer on stack #11

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

Open
harrymander wants to merge 3 commits into
base: master
Choose a base branch
from
Open

usb_cdc: store TX ring buffer on stack #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92bed3b
usb_cdc: store TX ring buffer on stack
harrymander Mar 27, 2023
7f77c1b
panic: fix undeclared symbol error due to undefined LED_ACTIVE macro
harrymander Apr 6, 2023
63249e1
tty: remove unnecessary includes
harrymander May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions panic/panic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ panic (pio_t led_error_pio, unsigned int error_code)
{
unsigned int i;

pio_config_set (led_error_pio, PIO_OUTPUT_LOW);
#ifndef LED_ACTIVE
#ifdef LED_ACTIVE
pio_output_set (led_error_pio, LED_ACTIVE);
#else
pio_config_set (led_error_pio, PIO_OUTPUT_LOW);
#endif

while (1)
Expand Down
3 changes: 0 additions & 3 deletions tty/tty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@
#include "tty.h"
#include "sys.h"
#include "errno.h"
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <string.h>


struct tty_struct
Expand Down
11 changes: 1 addition & 10 deletions usb_cdc/usb_cdc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#include "usb_cdc.h"
#include "usb_dsc.h"
#include "usb.h"
#include <stdlib.h>


/* CDC communication device class.
Expand All @@ -22,10 +21,6 @@
#define USB_CURRENT_MA 100
#endif

#ifndef USB_CDC_TX_RING_SIZE
#define USB_CDC_TX_RING_SIZE 80
#endif


#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
Expand Down Expand Up @@ -343,11 +338,7 @@ usb_cdc_init (const usb_cdc_cfg_t *cfg)
dev->writing = 0;
dev->connected = 0;

buffer = malloc (USB_CDC_TX_RING_SIZE);
if (!buffer)
return 0;

ring_init (&dev->tx_ring, buffer, USB_CDC_TX_RING_SIZE);
ring_init (&dev->tx_ring, dev->tx_ring_buffer, USB_CDC_TX_RING_SIZE);

dev->usb = usb_init (&usb_cdc_descriptors,
(void *)usb_cdc_request_handler);
Expand Down
6 changes: 6 additions & 0 deletions usb_cdc/usb_cdc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,16 @@ extern "C" {
#include "ring.h"


#ifndef USB_CDC_TX_RING_SIZE
#define USB_CDC_TX_RING_SIZE 80
#endif


typedef struct usb_cdc_struct
{
usb_t usb;
ring_t tx_ring;
uint8_t tx_ring_buffer[USB_CDC_TX_RING_SIZE];
uint32_t read_timeout_us;
uint32_t write_timeout_us;
volatile bool writing;
Expand Down