- gerrit-log - lists.osmocom.org

[S] Change in osmo-msc[master]: include SM-RP-UI in outgoing GSUP message when presesnt
by dotsimon 29 Jan '25

29 Jan '25

Attention is currently required from: fixeria, lynxis lazus, pespin. dotsimon has posted comments on this change by dotsimon. ( https://gerrit.osmocom.org/c/osmo-msc/+/39428?usp=email ) Change subject: include SM-RP-UI in outgoing GSUP message when presesnt ...................................................................... Patch Set 2: (1 comment) File src/libmsc/gsm_04_11_gsup.c: https://gerrit.osmocom.org/c/osmo-msc/+/39428/comment/7280c984_7c5288cf?usp… : PS2, Line 187: int gsm411_gsup_mt_fwd_sm_res(struct gsm_trans *trans, uint8_t sm_rp_mr, uint8_t *ui) > I'd say better pass the len as a separate param here, and pass the buffer as &(ui[1]) Ok sure. I'd already been thinking about further validating the length since fuzzing open mobile implementations has been in the news lately, so I'll add that too. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/39428?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I90a607900ac7c86b200c79b7e8c460d4cbb3c3ce Gerrit-Change-Number: 39428 Gerrit-PatchSet: 2 Gerrit-Owner: dotsimon <implorable-herd(a)yahoo.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 29 Jan 2025 21:13:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ccid-firmware[master]: add ext power detect & dev reset
by Hoernchen 29 Jan '25

29 Jan '25

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39447?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: add ext power detect & dev reset ...................................................................... add ext power detect & dev reset Change-Id: Ied62450670dba2227daa96cbcd162cfe8414445a --- M sysmoOCTSIM/main.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/47/39447/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39447?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ied62450670dba2227daa96cbcd162cfe8414445a Gerrit-Change-Number: 39447 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[XS] Change in osmo-ccid-firmware[master]: fix some warnings and add some warning flags
by Hoernchen 29 Jan '25

29 Jan '25

Hoernchen has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39448?usp=email ) Change subject: fix some warnings and add some warning flags ...................................................................... fix some warnings and add some warning flags Change-Id: I55e1de7fe8428a5c6cdf741cdc0ae7c47aa7c8d8 --- M ccid_common/ccid_slot_fsm.c M sysmoOCTSIM/gcc/Makefile M sysmoOCTSIM/main.c 3 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/48/39448/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I55e1de7fe8428a5c6cdf741cdc0ae7c47aa7c8d8 Gerrit-Change-Number: 39448 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: Jenkins Builder

1 0

[XS] Change in osmo-ccid-firmware[master]: gitignore
by Hoernchen 29 Jan '25

29 Jan '25

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39440?usp=email ) Change subject: gitignore ...................................................................... gitignore Change-Id: If3af97ed7fb8c600144dfd194f80c35a76c91e09 --- M .gitignore 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/40/39440/1 diff --git a/.gitignore b/.gitignore index 929436b..9f136b8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ ccid_host/cuart_test ccid_host/hub_functionfs contrib/ccid-control +sysmoOCTSIM/gcc/*.ihex +**/.cache/* +**/compile_commands.json -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39440?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: If3af97ed7fb8c600144dfd194f80c35a76c91e09 Gerrit-Change-Number: 39440 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: fix up usb version string, not 0 terminated, align
by Hoernchen 29 Jan '25

29 Jan '25

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39442?usp=email ) Change subject: fix up usb version string, not 0 terminated, align ...................................................................... fix up usb version string, not 0 terminated, align Change-Id: I198f0a55c5c5853ea58f20ad4124a909952a3074 --- M sysmoOCTSIM/main.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/42/39442/1 diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index bf145cd..e901cf7 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -462,8 +462,8 @@ char sernr_buf[16*2+1]; char product_buf[] = "sysmoOCTSIM "GIT_VERSION; //len, type, 2 byte per hex char * 2 for unicode -uint8_t sernr_buf_descr[1+1+16*2*2]; -uint8_t product_buf_descr[1+1+sizeof(product_buf)*2]; +uint8_t __attribute__ ((aligned (16))) sernr_buf_descr[1+1+16*2*2]; +uint8_t __attribute__ ((aligned (16))) product_buf_descr[1+1+(sizeof(product_buf)-1)*2]; char rstcause_buf[RSTCAUSE_STR_SIZE]; @@ -498,7 +498,7 @@ get_chip_unique_serial_str(sernr_buf, sizeof(sernr_buf)); str_to_usb_desc(sernr_buf, sizeof(sernr_buf), sernr_buf_descr, sizeof(sernr_buf_descr)); - str_to_usb_desc(product_buf, sizeof(product_buf), product_buf_descr, sizeof(product_buf_descr)); + str_to_usb_desc(product_buf, sizeof(product_buf)-1, product_buf_descr, sizeof(product_buf_descr)); get_rstcause_str(rstcause_buf); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39442?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I198f0a55c5c5853ea58f20ad4124a909952a3074 Gerrit-Change-Number: 39442 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[S] Change in osmo-ccid-firmware[master]: tame the linter
by Hoernchen 29 Jan '25

29 Jan '25

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39441?usp=email ) Change subject: tame the linter ...................................................................... tame the linter Change-Id: I84f8637b47047bb9b8c217b0869a486ceee7243f --- A .checkpatch.conf 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/41/39441/1 diff --git a/.checkpatch.conf b/.checkpatch.conf new file mode 100644 index 0000000..1f8c3dc --- /dev/null +++ b/.checkpatch.conf @@ -0,0 +1,17 @@ +--exclude sysmoOCTSIM/gcc/gcc/.*ld +--exclude sysmoOCTSIM/CMSIS +--exclude sysmoOCTSIM/hpl +--exclude sysmoOCTSIM/hal + +--ignore BRACES_NOT_NECESSARY +--ignore OPEN_BRACE +--ignore FSF_MAILING_ADDRESS +--ignore DOS_LINE_ENDINGS +--ignore FUNCTION_WITHOUT_ARGS +--ignore TRAILING_WHITESPACE +--ignore CODE_INDENT +--ignore SPACING +--ignore POINTER_LOCATION +--ignore INLINE_LOCATION +--ignore LEADING_SPACE +--ignore SUSPECT_CODE_INDENT -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I84f8637b47047bb9b8c217b0869a486ceee7243f Gerrit-Change-Number: 39441 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: strict prototypes
by Hoernchen 29 Jan '25

29 Jan '25

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39443?usp=email ) Change subject: strict prototypes ...................................................................... strict prototypes Change-Id: Ic2915a9182dc64ac1e3fba7da18a71ff9fe91944 --- M sysmoOCTSIM/command.c M sysmoOCTSIM/gcc/Makefile M sysmoOCTSIM/hpl/port/hpl_gpio_base.h M sysmoOCTSIM/main.c 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/43/39443/1 diff --git a/sysmoOCTSIM/command.c b/sysmoOCTSIM/command.c index 48d8c11..1a904d5 100644 --- a/sysmoOCTSIM/command.c +++ b/sysmoOCTSIM/command.c @@ -35,7 +35,7 @@ printf(" %-16s %s\r\n", g_cmds.cmd[i]->command, g_cmds.cmd[i]->help); } -static void cmd_execute() +static void cmd_execute(void) { char *argv[16]; unsigned int i; diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile index b9e89f9..a465287 100644 --- a/sysmoOCTSIM/gcc/Makefile +++ b/sysmoOCTSIM/gcc/Makefile @@ -11,7 +11,7 @@ CFLAGS_CPU=-D__SAME54N19A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 CFLAGS=-x c -mthumb -DDEBUG -Os -ffunction-sections -fdata-sections -mlong-calls \ - -g3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD -DDISABLE_DFU_DETACH=$(DISABLE_DFU_DETACH) + -g3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD -DDISABLE_DFU_DETACH=$(DISABLE_DFU_DETACH) -Wno-discarded-qualifiers -Werror=strict-prototypes CFLAGS += -DLIBOSMOCORE_NO_LOGGING diff --git a/sysmoOCTSIM/hpl/port/hpl_gpio_base.h b/sysmoOCTSIM/hpl/port/hpl_gpio_base.h index 12ff6f7..672e689 100644 --- a/sysmoOCTSIM/hpl/port/hpl_gpio_base.h +++ b/sysmoOCTSIM/hpl/port/hpl_gpio_base.h @@ -163,7 +163,7 @@ } } -static inline void _port_event_init() +static inline void _port_event_init(void) { hri_port_set_EVCTRL_reg(PORT, 0, CONF_PORTA_EVCTRL); hri_port_set_EVCTRL_reg(PORT, 1, CONF_PORTB_EVCTRL); diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index e901cf7..2dfc255 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -48,7 +48,7 @@ static void ccid_app_init(void); -static void board_init() +static void board_init(void) { int i; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39443?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ic2915a9182dc64ac1e3fba7da18a71ff9fe91944 Gerrit-Change-Number: 39443 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[XS] Change in osmo-ccid-firmware[master]: ccid dev: fix sizeof abuse
by Hoernchen 29 Jan '25

29 Jan '25

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39444?usp=email ) Change subject: ccid dev: fix sizeof abuse ...................................................................... ccid dev: fix sizeof abuse Change-Id: Ia96247af6f2a887d3c894a65983e795b9e5a7cbe --- M ccid_common/ccid_device.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/44/39444/1 diff --git a/ccid_common/ccid_device.c b/ccid_common/ccid_device.c index 405fb2e..398a2b4 100644 --- a/ccid_common/ccid_device.c +++ b/ccid_common/ccid_device.c @@ -137,7 +137,7 @@ static struct ccid_slot *get_ccid_slot(struct ccid_instance *ci, uint8_t slot_nr) { - if (slot_nr >= sizeof(ci->slot)) + if (slot_nr >= ARRAY_SIZE(ci->slot)) return NULL; else return &ci->slot[slot_nr]; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39444?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ia96247af6f2a887d3c894a65983e795b9e5a7cbe Gerrit-Change-Number: 39444 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[S] Change in osmo-ccid-firmware[master]: add ext power detect & dev reset
by Hoernchen 29 Jan '25

29 Jan '25

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39447?usp=email ) Change subject: add ext power detect & dev reset ...................................................................... add ext power detect & dev reset Change-Id: Ied62450670dba2227daa96cbcd162cfe8414445a --- M sysmoOCTSIM/main.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/47/39447/1 diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 191d4ae..7fd6ee7 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -325,7 +325,16 @@ } } +static bool old_extpwer_state = 0; +void init_extpower_detect(void) { + old_extpwer_state = gpio_get_pin_level(MUX_STAT); +} +void poll_extpower_detect(void) { + if (old_extpwer_state != gpio_get_pin_level(MUX_STAT)) { + NVIC_SystemReset(); + } +} /*********************************************************************** * Command Line interface @@ -516,6 +525,7 @@ get_rstcause_str(rstcause_buf); atmel_start_init(); + init_extpower_detect(); board_init(); usb_init(); usb_start(); @@ -578,6 +588,7 @@ while (true) { // main loop if(delayed_usb_reset) do_usb_res(); + poll_extpower_detect(); command_try_recv(); poll_card_detect(); submit_next_irq(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39447?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ied62450670dba2227daa96cbcd162cfe8414445a Gerrit-Change-Number: 39447 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

[M] Change in osmo-ccid-firmware[master]: fix usb usb reset handling by delayed soft reset
by Hoernchen 29 Jan '25

29 Jan '25

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39445?usp=email ) Change subject: fix usb usb reset handling by delayed soft reset ...................................................................... fix usb usb reset handling by delayed soft reset Requires BL clock init, not compatible with old bootloaders! Will always reboot to DFU mode with old bootloader/wrong clocks. Change-Id: I0939930a42f3009abf7e670561a123963bbd3845 --- M sysmoOCTSIM/atmel_start.c M sysmoOCTSIM/hpl/core/hpl_init.c M sysmoOCTSIM/hpl/usb/hpl_usb.c M sysmoOCTSIM/main.c M sysmoOCTSIM/usb_start.c 5 files changed, 35 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/45/39445/1 diff --git a/sysmoOCTSIM/atmel_start.c b/sysmoOCTSIM/atmel_start.c index d6304fa..4d52d0d 100644 --- a/sysmoOCTSIM/atmel_start.c +++ b/sysmoOCTSIM/atmel_start.c @@ -9,5 +9,4 @@ #ifdef ENABLE_DBG_UART7 stdio_redirect_init(); #endif - usb_init(); } diff --git a/sysmoOCTSIM/hpl/core/hpl_init.c b/sysmoOCTSIM/hpl/core/hpl_init.c index be0db93..e6997a3 100644 --- a/sysmoOCTSIM/hpl/core/hpl_init.c +++ b/sysmoOCTSIM/hpl/core/hpl_init.c @@ -54,13 +54,13 @@ { hri_nvmctrl_set_CTRLA_RWS_bf(NVMCTRL, CONF_NVM_WAIT_STATE); - _osc32kctrl_init_sources(); - _oscctrl_init_sources(); - _mclk_init(); -#if _GCLK_INIT_1ST - _gclk_init_generators_by_fref(_GCLK_INIT_1ST); -#endif - _oscctrl_init_referenced_generators(); + // _osc32kctrl_init_sources(); + // _oscctrl_init_sources(); + // _mclk_init(); +// #if _GCLK_INIT_1ST +// _gclk_init_generators_by_fref(_GCLK_INIT_1ST); +// #endif +// _oscctrl_init_referenced_generators(); _gclk_init_generators_by_fref(_GCLK_INIT_LAST); #if CONF_DMAC_ENABLE diff --git a/sysmoOCTSIM/hpl/usb/hpl_usb.c b/sysmoOCTSIM/hpl/usb/hpl_usb.c index 99e4606..8508842 100644 --- a/sysmoOCTSIM/hpl/usb/hpl_usb.c +++ b/sysmoOCTSIM/hpl/usb/hpl_usb.c @@ -44,6 +44,7 @@ /* save previous setup state to allow device reset when receving usb reset after the device * was previously properly configured, i.e. when powered externally and usb is disconnected and reconnected */ volatile bool address_was_set = false; +volatile bool delayed_usb_reset = false; /** * \brief Dummy callback function @@ -981,13 +982,8 @@ _usb_d_dev_reset_epts(); if(address_was_set == true) { - _usb_d_dev_detach(); address_was_set = 0; - delay_ms(100); - __disable_irq(); - __DMB(); - __DSB(); - NVIC_SystemReset(); + delayed_usb_reset = true; } dev_inst.callbacks.event(USB_EV_RESET, 0); diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 2dfc255..191d4ae 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -66,7 +66,6 @@ * (there are 8 inputs + traces to drive!) */ hri_port_set_PINCFG_DRVSTR_bit(PORT, 0, 11); - ccid_app_init(); } /*********************************************************************** @@ -467,6 +466,16 @@ char rstcause_buf[RSTCAUSE_STR_SIZE]; +void do_usb_res(void){ + hri_usbdevice_set_CTRLA_SWRST_bit(USB); + uint32_t* application_start_address = (uint32_t*)(16384); + __set_MSP(*application_start_address); + __DSB(); + __ISB(); + asm("bx %0"::"r"(*(application_start_address + 1))); +} + +extern volatile bool delayed_usb_reset; int main(void) { @@ -494,18 +503,23 @@ #endif - atmel_start_init(); + // return to dfu on mismatched old BL with improper clock config. + if(hri_gclk_read_GENCTRL_SRC_bf(GCLK, 0) == GCLK_GENCTRL_SRC_XOSC1_Val){ + *(uint32_t*)HSRAM_ADDR = 0x44465521; + NVIC_SystemReset(); + } + get_chip_unique_serial_str(sernr_buf, sizeof(sernr_buf)); str_to_usb_desc(sernr_buf, sizeof(sernr_buf), sernr_buf_descr, sizeof(sernr_buf_descr)); str_to_usb_desc(product_buf, sizeof(product_buf)-1, product_buf_descr, sizeof(product_buf_descr)); get_rstcause_str(rstcause_buf); - - - usb_start(); - + atmel_start_init(); board_init(); + usb_init(); + usb_start(); + ccid_app_init(); #ifdef WITH_DEBUG_CDC command_init("sysmoOCTSIM> "); @@ -562,6 +576,8 @@ // command_print_prompt(); while (true) { // main loop + if(delayed_usb_reset) + do_usb_res(); command_try_recv(); poll_card_detect(); submit_next_irq(); diff --git a/sysmoOCTSIM/usb_start.c b/sysmoOCTSIM/usb_start.c index d4057be..6946126 100644 --- a/sysmoOCTSIM/usb_start.c +++ b/sysmoOCTSIM/usb_start.c @@ -10,13 +10,13 @@ #include "usb_descriptors.h" #define CDCD_ECHO_BUF_SIZ CONF_USB_CDCD_ACM_DATA_BULKIN_MAXPKSZ - +#ifdef WITH_DEBUG_CDC /** Buffers to receive and echo the communication bytes. */ static uint32_t usbd_cdc_buffer[CDCD_ECHO_BUF_SIZ / 4]; - +#endif /** Ctrl endpoint buffer */ static uint8_t ctrl_buffer[64]; - +#ifdef WITH_DEBUG_CDC /** * \brief Callback invoked when bulk OUT data received */ @@ -56,7 +56,7 @@ /* No error. */ return false; } - +#endif extern const struct usbd_descriptors usb_descs[]; /* transmit given string descriptor */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I0939930a42f3009abf7e670561a123963bbd3845 Gerrit-Change-Number: 39445 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log