- gerrit-log - lists.osmocom.org

[XS] Change in osmo-pcu[master]: checkpath: Exclude csn1 files
by pespin 13 Mar '25

13 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39782?usp=email ) Change subject: checkpath: Exclude csn1 files ...................................................................... checkpath: Exclude csn1 files CSN.1 parsing code is inherited/co-maintained with wireshark.git code, and used to have its own coding style, so avoid enforcing osmocom code style in there. Change-Id: Ib6e7d2dcc3d8f262092f0100e55cad397aa226f4 --- M .checkpatch.conf 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/82/39782/1 diff --git a/.checkpatch.conf b/.checkpatch.conf index d808861..8194ffb 100644 --- a/.checkpatch.conf +++ b/.checkpatch.conf @@ -1 +1,4 @@ +--exclude ^src/csn1.c$ +--exclude ^src/csn1.h$ +--exclude ^src/csn1_(enc|dec).c$ --exclude ^src/gsm_rlcmac.c$ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39782?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib6e7d2dcc3d8f262092f0100e55cad397aa226f4 Gerrit-Change-Number: 39782 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcu[master]: encoding: Use defines to set PAYLOAD_TYPE
by pespin 13 Mar '25

13 Mar '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39777?usp=email ) Change subject: encoding: Use defines to set PAYLOAD_TYPE ...................................................................... encoding: Use defines to set PAYLOAD_TYPE Change-Id: I3d663cb91672fb383aeb72b223490fa615bdcdf0 --- M src/encoding.cpp M src/gsm_rlcmac.c M src/gsm_rlcmac.h 3 files changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index 75b9a30..b10b9a3 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -602,7 +602,7 @@ Dynamic_Allocation_t *da; /* RLC/MAC control block without the optional RLC/MAC control header */ - block->PAYLOAD_TYPE = 0x01; // Payload Type + block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // Payload Type block->RRBP = rrbp; // RRBP (e.g. N+13) block->SP = poll; // RRBP field is valid block->USF = 0x00; // Uplink state flag @@ -720,7 +720,7 @@ uint8_t tn; - block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header + block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header block->RRBP = rrbp; // 0: N+13 block->SP = poll; // RRBP field is valid block->USF = 0x0; // Uplink state flag @@ -1759,7 +1759,7 @@ uint8_t container_idx, PNCDContainer_t *container) { - block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header + block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header block->RRBP = 0; // 0: N+13 block->SP = 0; // RRBP field is not valid block->USF = 0x0; // Uplink state flag @@ -1784,7 +1784,7 @@ uint16_t arfcn, uint8_t bsic, uint8_t container_id) { - block->PAYLOAD_TYPE = 0x1; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header + block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET; // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header block->RRBP = rrbp; // RRBP (e.g. N+13) block->SP = poll; // RRBP field is valid? block->USF = 0x0; // Uplink state flag diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index 931c85c..79fda90 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -36,12 +36,6 @@ #include <arpa/inet.h> #include <gprs_debug.h> -/* Payload type as defined in TS 44.060 / 10.4.7 */ -#define PAYLOAD_TYPE_DATA 0 -#define PAYLOAD_TYPE_CTRL_NO_OPT_OCTET 1 -#define PAYLOAD_TYPE_CTRL_OPT_OCTET 2 -#define PAYLOAD_TYPE_RESERVED 3 - /* CSN1 structures */ /*(not all parts of CSN_DESCR structure are always initialized.)*/ static const diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index c43d418..d34024a 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -48,6 +48,12 @@ typedef guint8 N51_t; typedef guint8 N26_t; +/* Payload type as defined in TS 44.060 / 10.4.7 */ +#define PAYLOAD_TYPE_DATA 0 +#define PAYLOAD_TYPE_CTRL_NO_OPT_OCTET 1 +#define PAYLOAD_TYPE_CTRL_OPT_OCTET 2 +#define PAYLOAD_TYPE_RESERVED 3 + /* Starting Time IE as specified in 04.08 */ typedef struct { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39777?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d663cb91672fb383aeb72b223490fa615bdcdf0 Gerrit-Change-Number: 39777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcu[master]: encoding: Use defines to set PAYLOAD_TYPE
by pespin 13 Mar '25

13 Mar '25

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39777?usp=email ) Change subject: encoding: Use defines to set PAYLOAD_TYPE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39777?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d663cb91672fb383aeb72b223490fa615bdcdf0 Gerrit-Change-Number: 39777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Mar 2025 18:42:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: HTTP_Server_Emulation: allow multiple HTTP server ports
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39733?usp=email ) Change subject: HTTP_Server_Emulation: allow multiple HTTP server ports ...................................................................... HTTP_Server_Emulation: allow multiple HTTP server ports At the moment the HTTP_Server_Emulation component can only provide a single HTTP server. Let's extend it so that it can provide multiple HTTP server. Related: SYS#7339 Change-Id: I11df9df5c3041f977b458835e923c74abe3bba7b --- M eim/eIM_Tests.ttcn M ipad/IPAd_Tests.ttcn M library/HTTP_Server_Emulation.ttcn 3 files changed, 17 insertions(+), 14 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/eim/eIM_Tests.ttcn b/eim/eIM_Tests.ttcn index da5d571..5dcbdab 100644 --- a/eim/eIM_Tests.ttcn +++ b/eim/eIM_Tests.ttcn @@ -108,8 +108,8 @@ /* connect ES9+/HTTP-server ports */ if (isbound(vc_HTTP)) { - connect(vc_conn:HTTP_SRV, vc_HTTP:CLIENT); - connect(vc_conn:HTTP_SRV_PROC, vc_HTTP:CLIENT_PROC); + connect(vc_conn:HTTP_SRV[0], vc_HTTP:CLIENT); + connect(vc_conn:HTTP_SRV_PROC[0], vc_HTTP:CLIENT_PROC); } vc_conn.start(f_init_handler(fn, id, pars)); @@ -172,7 +172,7 @@ T.start; alt { - [] HTTP_SRV.receive({ request := ? }) -> value es9p_req { + [] HTTP_SRV[0].receive({ request := ? }) -> value es9p_req { dec_RemoteProfileProvisioningRequest_from_JSON(es9p_req.request.body, request); } [] T.timeout { @@ -187,7 +187,7 @@ private function f_es9p_send(RemoteProfileProvisioningResponse es9p_res) runs on eIM_ConnHdlr { var charstring es9p_res_json; enc_RemoteProfileProvisioningResponse_to_JSON(es9p_res, es9p_res_json); - HTTP_SRV.send(ts_http_resp(es9p_res_json)); + HTTP_SRV[0].send(ts_http_resp(es9p_res_json)); } /* Perform Es9p HTTP request/response cycle */ diff --git a/ipad/IPAd_Tests.ttcn b/ipad/IPAd_Tests.ttcn index 04e4b1d..c8f3928 100644 --- a/ipad/IPAd_Tests.ttcn +++ b/ipad/IPAd_Tests.ttcn @@ -134,8 +134,8 @@ vc_conn := IPAd_ConnHdlr.create(id); if (isbound(vc_HTTP)) { - connect(vc_conn:HTTP_SRV, vc_HTTP:CLIENT); - connect(vc_conn:HTTP_SRV_PROC, vc_HTTP:CLIENT_PROC); + connect(vc_conn:HTTP_SRV[0], vc_HTTP:CLIENT); + connect(vc_conn:HTTP_SRV_PROC[0], vc_HTTP:CLIENT_PROC); } vc_conn.start(f_init_handler(fn, id, pars)); @@ -352,7 +352,7 @@ T.start; alt { - [] HTTP_SRV.receive({ request_binary := ? }) -> value esipa_req_encoded { + [] HTTP_SRV[0].receive({ request_binary := ? }) -> value esipa_req_encoded { esipa_req := dec_EsipaMessageFromIpaToEim(esipa_req_encoded.request_binary.body); if (not istemplatekind(expected_esipa_req, "omit")) { if (not match(valueof(esipa_req), expected_esipa_req)) { @@ -372,7 +372,7 @@ private function f_esipa_send(EsipaMessageFromEimToIpa esipa_res) runs on IPAd_ConnHdlr { var octetstring esipa_res_encoded; esipa_res_encoded := enc_EsipaMessageFromEimToIpa(esipa_res); - HTTP_SRV.send(ts_http_resp(esipa_res_encoded)); + HTTP_SRV[0].send(ts_http_resp(esipa_res_encoded)); } /* Perform one ESipa HTTP request/response cycle */ @@ -392,7 +392,7 @@ var EsipaMessageFromIpaToEim esipa_req; esipa_req := f_esipa_receive(expected_esipa_req); - HTTP_SRV.send(ts_http_resp(''O)); + HTTP_SRV[0].send(ts_http_resp(''O)); return esipa_req; } diff --git a/library/HTTP_Server_Emulation.ttcn b/library/HTTP_Server_Emulation.ttcn index 16d142d..9270ccb 100644 --- a/library/HTTP_Server_Emulation.ttcn +++ b/library/HTTP_Server_Emulation.ttcn @@ -134,13 +134,16 @@ ***********************************************************************/ type component HTTP_ConnHdlr { - port HTTP_SRV_PT HTTP_SRV; - port HTTP_SRV_PROC_PT HTTP_SRV_PROC; + /* These ports are not connected to anything in this component, they + * serve as connection points for the component that extends this + * coponent. */ + port HTTP_SRV_PT HTTP_SRV[16]; + port HTTP_SRV_PROC_PT HTTP_SRV_PROC[16]; }; -function f_http_register() runs on HTTP_ConnHdlr { - HTTP_SRV_PROC.call(HTTPEM_register:{}) { - [] HTTP_SRV_PROC.getreply(HTTPEM_register:{}); +function f_http_register(integer id := 0) runs on HTTP_ConnHdlr { + HTTP_SRV_PROC[id].call(HTTPEM_register:{}) { + [] HTTP_SRV_PROC[id].getreply(HTTPEM_register:{}); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39733?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I11df9df5c3041f977b458835e923c74abe3bba7b Gerrit-Change-Number: 39733 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmo-ttcn3-hacks[master]: HTTP_Server_Emulation: allow multiple HTTP server ports
by laforge 13 Mar '25

13 Mar '25

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39733?usp=email ) Change subject: HTTP_Server_Emulation: allow multiple HTTP server ports ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39733?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I11df9df5c3041f977b458835e923c74abe3bba7b Gerrit-Change-Number: 39733 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Mar 2025 15:03:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ccid-firmware[master]: add ext power detect & dev reset
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( 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 M sysmoOCTSIM/usb/device/usbdc.c 2 files changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index afb70e9..9849298 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -324,7 +324,19 @@ } } +/* used to update the usb ext power dev status flag + reset the device when (un)plugging ext power */ +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 +528,7 @@ get_rstcause_str(rstcause_buf); atmel_start_init(); + init_extpower_detect(); board_init(); usb_init(); usb_start(); @@ -578,6 +591,7 @@ while (true) { // main loop if (delayed_usb_reset) do_usb_res(); + poll_extpower_detect(); command_try_recv(); poll_card_detect(); submit_next_irq(); diff --git a/sysmoOCTSIM/usb/device/usbdc.c b/sysmoOCTSIM/usb/device/usbdc.c index 3cfd7bc..4b84937 100644 --- a/sysmoOCTSIM/usb/device/usbdc.c +++ b/sysmoOCTSIM/usb/device/usbdc.c @@ -35,6 +35,8 @@ #define USBDC_VERSION 0x00000001u +extern bool old_extpwer_state; + /** * \brief USB Device Core Sof Handler */ @@ -318,6 +320,8 @@ switch (req->bmRequestType & USB_REQT_RECIP_MASK) { case USB_REQT_RECIP_DEVICE: + st = old_extpwer_state ? 0x0 : 0x1; + break; case USB_REQT_RECIP_INTERFACE: st = 0; break; -- 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: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ied62450670dba2227daa96cbcd162cfe8414445a Gerrit-Change-Number: 39447 Gerrit-PatchSet: 11 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[M] Change in osmo-ccid-firmware[master]: fix usb usb reset handling by delayed soft reset
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( 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, 34 insertions(+), 22 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified 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..4121053 100644 --- a/sysmoOCTSIM/hpl/core/hpl_init.c +++ b/sysmoOCTSIM/hpl/core/hpl_init.c @@ -53,14 +53,15 @@ void _init_chip(void) { hri_nvmctrl_set_CTRLA_RWS_bf(NVMCTRL, CONF_NVM_WAIT_STATE); - +#if 0 _osc32kctrl_init_sources(); _oscctrl_init_sources(); _mclk_init(); -#if _GCLK_INIT_1ST + #if _GCLK_INIT_1ST _gclk_init_generators_by_fref(_GCLK_INIT_1ST); -#endif + #endif _oscctrl_init_referenced_generators(); +#endif _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..c7e2d33 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 @@ -980,14 +981,9 @@ _usb_d_dev_reset_epts(); - if(address_was_set == true) { - _usb_d_dev_detach(); + if (address_was_set == true) { 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 d1524c5..afb70e9 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -65,8 +65,6 @@ /* increase drive strength of 20Mhz SIM clock output to 8mA * (there are 8 inputs + traces to drive!) */ hri_port_set_PINCFG_DRVSTR_bit(PORT, 0, 11); - - ccid_app_init(); } /*********************************************************************** @@ -467,6 +465,17 @@ 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: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I0939930a42f3009abf7e670561a123963bbd3845 Gerrit-Change-Number: 39445 Gerrit-PatchSet: 7 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-ccid-firmware[master]: usb desc: use per-interface dev class instead of CDC
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39446?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: usb desc: use per-interface dev class instead of CDC ...................................................................... usb desc: use per-interface dev class instead of CDC Change-Id: I9d4f88b973f0c16d2c1241343d416496b35019a0 --- M sysmoOCTSIM/usb_descriptors.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/usb_descriptors.c b/sysmoOCTSIM/usb_descriptors.c index 94a473e..d3084cc 100644 --- a/sysmoOCTSIM/usb_descriptors.c +++ b/sysmoOCTSIM/usb_descriptors.c @@ -31,7 +31,7 @@ .bLength = sizeof(struct usb_dev_desc), .bDescriptorType = USB_DT_DEVICE, .bcdUSB = USB_V2_0, - .bDeviceClass = 0x02, + .bDeviceClass = 0x00, .bDeviceSubClass = 0, .bDeviceProtocol = 0, .bMaxPacketSize0 = CONF_USB_CDCD_ACM_BMAXPKSZ0, -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I9d4f88b973f0c16d2c1241343d416496b35019a0 Gerrit-Change-Number: 39446 Gerrit-PatchSet: 8 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmo-ccid-firmware[master]: fix some warnings and add some warning flags
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( 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 M sysmoOCTSIM/usb/class/ccid/device/ccid_df.c 4 files changed, 7 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c index 788e3ae..eb0c145 100644 --- a/ccid_common/ccid_slot_fsm.c +++ b/ccid_common/ccid_slot_fsm.c @@ -22,6 +22,9 @@ #include <errno.h> #include <string.h> +#ifdef OCTSIMFWBUILD +#include "hal/include/hal_delay.h" +#endif #include <osmocom/core/msgb.h> #include <osmocom/core/timer.h> #include <osmocom/core/logging.h> diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile index a465287..0f2a909 100644 --- a/sysmoOCTSIM/gcc/Makefile +++ b/sysmoOCTSIM/gcc/Makefile @@ -11,7 +11,8 @@ 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) -Wno-discarded-qualifiers -Werror=strict-prototypes + -fno-omit-frame-pointer -ggdb3 -Wall -c -std=gnu99 $(CFLAGS_CPU) -DOCTSIMFWBUILD -DDISABLE_DFU_DETACH=$(DISABLE_DFU_DETACH) -Wno-discarded-qualifiers -Werror=strict-prototypes -fno-common -Wno-unused-variable -Wno-unused-function -Wlarger-than=512 -Wstack-usage=255 + CFLAGS += -DLIBOSMOCORE_NO_LOGGING diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 9849298..79a74f8 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -17,9 +17,7 @@ */ #include <stdlib.h> -#include <inttypes.h> #include <stdio.h> -#include <math.h> #include <parts.h> #include <errno.h> @@ -31,12 +29,10 @@ #include "atmel_start.h" #include "atmel_start_pins.h" -#include "config/hpl_gclk_config.h" #include "i2c_bitbang.h" #include "octsim_i2c.h" #include "ncn8025.h" -#include "iso7816_3.h" #include "command.h" diff --git a/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c b/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c index e418010..2227a23 100644 --- a/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c +++ b/sysmoOCTSIM/usb/class/ccid/device/ccid_df.c @@ -24,7 +24,9 @@ #include "ccid_proto.h" #include "usb_includes.h" +#ifdef WITH_DEBUG_CDC #include "cdcdf_acm_desc.h" +#endif #include "usb_descriptors.h" #ifndef USB_CLASS_CCID -- 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: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I55e1de7fe8428a5c6cdf741cdc0ae7c47aa7c8d8 Gerrit-Change-Number: 39448 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-ccid-firmware[master]: out ep: fix swapped error handling
by laforge 13 Mar '25

13 Mar '25

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39501?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: out ep: fix swapped error handling ...................................................................... out ep: fix swapped error handling Change-Id: I2833f0aca3ffebfceaaf2a0681a9f8242817e722 --- M sysmoOCTSIM/main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c index 79a74f8..51421aa 100644 --- a/sysmoOCTSIM/main.c +++ b/sysmoOCTSIM/main.c @@ -205,7 +205,7 @@ rc = ccid_df_read_out(msgb_data(msg), msgb_tailroom(msg)); if (rc != ERR_NONE) { /* re-add to the list of free msgb's */ - llist_add_tail_at(&g_ccid_s.free_q, &msg->list); + llist_add_tail_at(&msg->list, &g_ccid_s.free_q); return 0; } return 1; -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39501?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I2833f0aca3ffebfceaaf2a0681a9f8242817e722 Gerrit-Change-Number: 39501 Gerrit-PatchSet: 7 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log