- gerrit-log - lists.osmocom.org

Change in osmo-iuh[master]: add unittest for ranap_transp_layer_addr_decode()

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26856 ) Change subject: add unittest for ranap_transp_layer_addr_decode() ...................................................................... add unittest for ranap_transp_layer_addr_decode() The function ranap_transp_layer_addr_decode() lacks a unit test. Lets add one. Change-Id: I6d7427dc07c858a8dd76c1fb536ec3df3d96f1b1 --- M src/tests/test-helpers.c M src/tests/test-helpers.ok 2 files changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/56/26856/1 diff --git a/src/tests/test-helpers.c b/src/tests/test-helpers.c index 96540dc..4ca7334 100644 --- a/src/tests/test-helpers.c +++ b/src/tests/test-helpers.c @@ -319,6 +319,34 @@ OSMO_ASSERT(tli == NULL); } +void test_ranap_transp_layer_addr_decode(void) +{ + int rc; + char addr[100]; + RANAP_TransportLayerAddress_t trasp_layer_addr = { 0 }; + uint8_t encoded_addr_x213_nsap[] = + { 0x35, 0x00, 0x01, 0x01, 0x02, 0x03, 0x04, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; + uint8_t encoded_addr[] = { 0x01, 0x02, 0x03, 0x04 }; + + printf("Testing function ranap_transp_layer_addr_decode()\n"); + + printf(" ipv4, x213_nsap\n"); + trasp_layer_addr.buf = encoded_addr_x213_nsap; + trasp_layer_addr.size = sizeof(encoded_addr_x213_nsap); + rc = ranap_transp_layer_addr_decode(addr, sizeof(addr), &trasp_layer_addr); + printf(" addr=%s\n", addr); + OSMO_ASSERT(rc == 0); + + printf(" ipv4\n"); + trasp_layer_addr.buf = encoded_addr; + trasp_layer_addr.size = sizeof(encoded_addr); + rc = ranap_transp_layer_addr_decode(addr, sizeof(addr), &trasp_layer_addr); + printf(" addr=%s\n", addr); + OSMO_ASSERT(rc == 0); +} + int main(int argc, char **argv) { asn1_xer_print = 0; @@ -331,6 +359,7 @@ test_ranap_common(); test_ranap_new_transp_info_gtp(); test_ranap_new_transp_info_rtp(); + test_ranap_transp_layer_addr_decode(); test_common_cleanup(); return 0; diff --git a/src/tests/test-helpers.ok b/src/tests/test-helpers.ok index 049fbb4..fe08287 100644 --- a/src/tests/test-helpers.ok +++ b/src/tests/test-helpers.ok @@ -51,3 +51,8 @@ transportLayerAddress = f11ff22ff33ff44ff55ff66ff77ff88f bindingID = 11220000 unsupported address family +Testing function ranap_transp_layer_addr_decode() + ipv4, x213_nsap + addr=1.2.3.4 + ipv4 + addr=1.2.3.4 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d7427dc07c858a8dd76c1fb536ec3df3d96f1b1 Gerrit-Change-Number: 26856 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 6 months

3
5
0 0

Change in osmo-iuh[master]: jenkins.sh: osmo-iuh no longer has doc/manuals/ make target

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26866 ) Change subject: jenkins.sh: osmo-iuh no longer has doc/manuals/ make target ...................................................................... jenkins.sh: osmo-iuh no longer has doc/manuals/ make target the doc/manuals directory was dropped together with osmo-hnbgw binary when it was moved to a separate repository recently. Change-Id: Iceefc4e477ab516c5dc08e6c5b859c48d92a1b61 --- M contrib/jenkins.sh 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/66/26866/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index a3a3d4a..9ee073d 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -62,9 +62,5 @@ $MAKE $PARALLEL_MAKE distcheck \ || cat-testlogs.sh -if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then - make -C "$base/doc/manuals" publish -fi - $MAKE $PARALLEL_MAKE maintainer-clean osmo-clean-workspace.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iceefc4e477ab516c5dc08e6c5b859c48d92a1b61 Gerrit-Change-Number: 26866 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 6 months

2
2
0 0

Change in simtrace2[master]: firmware: add definition for main osc bypass when using external osc

by James Tavares

James Tavares has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26861 ) Change subject: firmware: add definition for main osc bypass when using external osc ...................................................................... firmware: add definition for main osc bypass when using external osc Add new board.h definition BOARD_MAINOSC_BYPASS to configure the clock module to use an external oscillator rather than a crystal. The qmod board is one such board. Change-Id: If62f55cd4c8b0cf758534f09d25a9bcb028814a7 --- M firmware/libboard/common/source/board_lowlevel.c M firmware/libboard/qmod/include/board.h 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/61/26861/1 diff --git a/firmware/libboard/common/source/board_lowlevel.c b/firmware/libboard/common/source/board_lowlevel.c index 1ddbcba..a04ce10 100644 --- a/firmware/libboard/common/source/board_lowlevel.c +++ b/firmware/libboard/common/source/board_lowlevel.c @@ -147,7 +147,7 @@ } */ -#ifndef qmod +#ifndef BOARD_MAINOSC_BYPASS /* Initialize main oscillator */ if ( !(PMC->CKGR_MOR & CKGR_MOR_MOSCSEL) ) { @@ -165,11 +165,11 @@ timeout = 0; while (!(PMC->PMC_SR & PMC_SR_MOSCSELS) && (timeout++ < CLOCK_TIMEOUT)); #else - /* QMOD has external 12MHz clock source */ + /* Board has external clock, not a crystal oscillator */ PIOB->PIO_PDR = (1 << 9); PIOB->PIO_PUDR = (1 << 9); PIOB->PIO_PPDDR = (1 << 9); - PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTBY| CKGR_MOR_MOSCSEL; + PMC->CKGR_MOR = CKGR_MOR_KEY(0x37) | CKGR_MOR_MOSCRCEN | CKGR_MOR_MOSCXTBY | CKGR_MOR_MOSCSEL; #endif /* disable the red LED after main clock initialization */ diff --git a/firmware/libboard/qmod/include/board.h b/firmware/libboard/qmod/include/board.h index 6d7d4ff..7ea5bd7 100644 --- a/firmware/libboard/qmod/include/board.h +++ b/firmware/libboard/qmod/include/board.h @@ -25,6 +25,8 @@ #define BOARD_MAINOSC 12000000 /** desired main clock frequency (in Hz, based on BOARD_MAINOSC) */ #define BOARD_MCK 58000000 // 18.432 * 29 / 6 +/** board has external clock, not crystal */ +#define BOARD_MAINOSC_BYPASS /** MCU pin connected to red LED */ #define PIO_LED_RED PIO_PA17 @@ -35,7 +37,7 @@ /** green LED pin definition */ #define PIN_LED_GREEN {PIO_LED_GREEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT} /** LEDs pin definition */ -#define PINS_LEDS PIN_LED_RED, PIN_LED_GREEN +#define PINS_LEDS PIN_LED_RED, PIN_LED_GREEN /** index for red LED in LEDs pin definition array */ #define LED_NUM_RED 0 /** index for green LED in LEDs pin definition array */ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If62f55cd4c8b0cf758534f09d25a9bcb028814a7 Gerrit-Change-Number: 26861 Gerrit-PatchSet: 1 Gerrit-Owner: James Tavares <jtavares(a)kvh.com> Gerrit-MessageType: newchange

3 years, 6 months

2
2
0 0

Change in simtrace2[master]: simtrace2-tool: add "modem sim-card (insert|remove)" command

by James Tavares

James Tavares has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26863 ) Change subject: simtrace2-tool: add "modem sim-card (insert|remove)" command ...................................................................... simtrace2-tool: add "modem sim-card (insert|remove)" command Add a new command to request that the simtrace2 firmware manipulate the card detect signal, causing the downstream cellular modem to believe that the SIM card has been inserted or removed, respectfully. Change-Id: I8c79eb29379a789d9d0d21495e30d66ddbdfb022 --- M host/src/simtrace2-tool.c 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/63/26863/1 diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index d92638f..eb61ee2 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -65,6 +65,7 @@ printf( "Commands:\n" "\tmodem reset (enable|disable|cycle)\n" "\tmodem sim-switch (local|remote)\n" + "\tmodem sim-card (insert|remove)\n" "\n"); } @@ -167,6 +168,29 @@ return 0; } +/* emulate SIM card insertion / removal from modem */ +static int do_modem_sim_card(int argc, char **argv) +{ + char *command; + if (argc < 1) + return -EINVAL; + command = argv[0]; + argc--; + argv++; + + if (!strcmp(command, "insert")) { + printf("Setting SIM=INSERTED; Modem reset recommended\n"); + return osmo_st2_cardem_request_card_insert(ci, 1); + } else if (!strcmp(command, "remove")) { + printf("Setting SIM=REMOVED; Modem reset recommended\n"); + return osmo_st2_cardem_request_card_insert(ci, 0); + } else { + fprintf(stderr, "Unsupported modem sim-card command: '%s'\n", command); + return -EINVAL; + } + return 0; +} + static int do_subsys_modem(int argc, char **argv) { char *command; @@ -182,6 +206,8 @@ rc = do_modem_reset(argc, argv); } else if (!strcmp(command, "sim-switch")) { rc = do_modem_sim_switch(argc, argv); + } else if (!strcmp(command, "sim-card")) { + rc = do_modem_sim_card(argc, argv); } else { fprintf(stderr, "Unsupported command for subsystem modem: '%s'\n", command); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I8c79eb29379a789d9d0d21495e30d66ddbdfb022 Gerrit-Change-Number: 26863 Gerrit-PatchSet: 1 Gerrit-Owner: James Tavares <jtavares(a)kvh.com> Gerrit-MessageType: newchange

3 years, 6 months

2
3
0 0

Change in osmo-iuh[master]: iu_helpers: check length before accessing buf

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26855 ) Change subject: iu_helpers: check length before accessing buf ...................................................................... iu_helpers: check length before accessing buf in ranap_transp_layer_addr_decode() we access the buffer buf before checking the length field. This can lead to a segfault when the buffer has a length of 0. Change-Id: I983f6e5e4cee47b3f5719829e1310b8e2e33ffaf --- M src/iu_helpers.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26855/1 diff --git a/src/iu_helpers.c b/src/iu_helpers.c index 392622f..62f5c22 100644 --- a/src/iu_helpers.c +++ b/src/iu_helpers.c @@ -113,7 +113,7 @@ buf = trasp_layer_addr->buf; len = trasp_layer_addr->size; - if (buf[0] == 0x35 && len >= 7) + if (len >= 7 && buf[0] == 0x35) rc = inet_ntop(AF_INET, buf + 3, addr, addr_len); else if (len > 3) rc = inet_ntop(AF_INET, buf, addr, addr_len); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I983f6e5e4cee47b3f5719829e1310b8e2e33ffaf Gerrit-Change-Number: 26855 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 6 months

3
3
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: add port number argument to e1_tick_read()

by tnt

tnt has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21732 ) Change subject: icE1usb fw: add port number argument to e1_tick_read() ...................................................................... Abandoned Superseeded -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/21732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I0f4548b5623a7eaf74af3076c301e029bb3933da Gerrit-Change-Number: 21732 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: abandon

3 years, 6 months

1
0
0 0

Change in osmo-msc[master]: ran_msg_iu.c: Set proper codec in Assignment Complete

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/26806 ) Change subject: ran_msg_iu.c: Set proper codec in Assignment Complete ...................................................................... ran_msg_iu.c: Set proper codec in Assignment Complete We need to set the codec as present in order for msc_a_up_call_assignment_complete() to configure properly the CN-side of he leg with the IUFP codec, which should be the desired default in order to avoid transcoding. Change-Id: Ib8086462239e2df748cf47ea7b37a07f1f3b85a8 --- M src/libmsc/ran_msg_iu.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/06/26806/1 diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c index c10df4d..ee1d0a5 100644 --- a/src/libmsc/ran_msg_iu.c +++ b/src/libmsc/ran_msg_iu.c @@ -153,7 +153,8 @@ .msg_type = RAN_MSG_ASSIGNMENT_COMPLETE, .msg_name = "RANAP RAB Assignment Response", .assignment_complete = { - .codec = CODEC_AMR_8000_1, + .codec_present = true, + .codec = CODEC_IUFP, }, }; if (osmo_sockaddr_str_from_str(&ran_dec_msg->assignment_complete.remote_rtp, addr, port)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/26806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib8086462239e2df748cf47ea7b37a07f1f3b85a8 Gerrit-Change-Number: 26806 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 6 months

3
3
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Don't expose some E1 helper functions globally

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26831 ) Change subject: icE1usb fw: Don't expose some E1 helper functions globally ...................................................................... icE1usb fw: Don't expose some E1 helper functions globally Not used anywhere and really shouldn't be Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I1e339d1b8faecffba5f8d73588b376edc7a75a96 --- M firmware/ice40-riscv/icE1usb/e1.c M firmware/ice40-riscv/icE1usb/e1.h 2 files changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/31/26831/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index f5e367e..59be063 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -21,13 +21,13 @@ static volatile struct e1_core * const e1_regs = (void *)(E1_CORE_BASE); static volatile uint8_t * const e1_data = (void *)(E1_DATA_BASE); -unsigned int +static unsigned int e1_data_ofs(int mf, int frame, int ts) { return (mf << 9) | (frame << 5) | ts; } -volatile uint8_t * +static volatile uint8_t * e1_data_ptr(int mf, int frame, int ts) { return &e1_data[e1_data_ofs(mf, frame, ts)]; diff --git a/firmware/ice40-riscv/icE1usb/e1.h b/firmware/ice40-riscv/icE1usb/e1.h index 4394638..4cbb6e5 100644 --- a/firmware/ice40-riscv/icE1usb/e1.h +++ b/firmware/ice40-riscv/icE1usb/e1.h @@ -28,9 +28,6 @@ const struct e1_error_count *e1_get_error_count(void); -volatile uint8_t *e1_data_ptr(int mf, int frame, int ts); -unsigned int e1_data_ofs(int mf, int frame, int ts); - enum e1_platform_led { E1P_LED_GREEN = 0, E1P_LED_YELLOW = 1, -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I1e339d1b8faecffba5f8d73588b376edc7a75a96 Gerrit-Change-Number: 26831 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

2
2
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Remove useless variable in main loop

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26833 ) Change subject: icE1usb fw: Remove useless variable in main loop ...................................................................... icE1usb fw: Remove useless variable in main loop Left over from early testing code ... Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I242bbcd42ba96f56bf12bbe57537f3a72a44767b --- M firmware/ice40-riscv/icE1usb/fw_app.c 1 file changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/33/26833/1 diff --git a/firmware/ice40-riscv/icE1usb/fw_app.c b/firmware/ice40-riscv/icE1usb/fw_app.c index eebc21f..39173f2 100644 --- a/firmware/ice40-riscv/icE1usb/fw_app.c +++ b/firmware/ice40-riscv/icE1usb/fw_app.c @@ -64,7 +64,6 @@ void main() { - bool e1_active = false; int cmd = 0; /* Init console IO */ @@ -103,7 +102,6 @@ /* Start */ e1_init(0, 0); - e1_active = true; led_state(true); usb_connect(); @@ -153,9 +151,7 @@ usb_poll(); /* E1 poll */ - if (e1_active) { - e1_poll(); - usb_e1_run(); - } + e1_poll(); + usb_e1_run(); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I242bbcd42ba96f56bf12bbe57537f3a72a44767b Gerrit-Change-Number: 26833 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 6 months

2
2
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Misc cosmetic cleanup in e1.{c,h} / usb_e1.c

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26832 ) Change subject: icE1usb fw: Misc cosmetic cleanup in e1.{c,h} / usb_e1.c ...................................................................... icE1usb fw: Misc cosmetic cleanup in e1.{c,h} / usb_e1.c Moving things around, comments, spacing, ... nothing functional. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Icc2a6ef6b03c89dd92e661a01d219e42dbf7067d --- M firmware/ice40-riscv/icE1usb/e1.c M firmware/ice40-riscv/icE1usb/e1.h M firmware/ice40-riscv/icE1usb/usb_e1.c 3 files changed, 26 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/32/26832/1 diff --git a/firmware/ice40-riscv/icE1usb/e1.c b/firmware/ice40-riscv/icE1usb/e1.c index 59be063..6a4c73c 100644 --- a/firmware/ice40-riscv/icE1usb/e1.c +++ b/firmware/ice40-riscv/icE1usb/e1.c @@ -18,9 +18,16 @@ #include "led.h" // FIXME +// HW access +// --------- + static volatile struct e1_core * const e1_regs = (void *)(E1_CORE_BASE); static volatile uint8_t * const e1_data = (void *)(E1_DATA_BASE); + +// Helpers +// ------- + static unsigned int e1_data_ofs(int mf, int frame, int ts) { @@ -33,6 +40,7 @@ return &e1_data[e1_data_ofs(mf, frame, ts)]; } + // FIFOs // ----- /* Note: FIFO works at 'frame' level (i.e. 32 bytes) */ @@ -98,7 +106,6 @@ return (ofs >> 4); } - /* Debug */ static void e1f_debug(struct e1_fifo *fifo, const char *name) @@ -207,7 +214,6 @@ } - // Main logic // ---------- @@ -232,12 +238,11 @@ int in_flight; enum e1_pipe_state state; } tx; + struct e1_error_count errors; } g_e1; - - void e1_init(uint16_t rx_cr, uint16_t tx_cr) { @@ -285,8 +290,6 @@ e1_regs->rx.csr = g_e1.rx.cr; } -#include "dma.h" - unsigned int e1_rx_need_data(unsigned int usb_addr, unsigned int max_frames, unsigned int *pos) { diff --git a/firmware/ice40-riscv/icE1usb/e1.h b/firmware/ice40-riscv/icE1usb/e1.h index 4cbb6e5..9ceffdd 100644 --- a/firmware/ice40-riscv/icE1usb/e1.h +++ b/firmware/ice40-riscv/icE1usb/e1.h @@ -7,6 +7,9 @@ #pragma once + +/* control */ + void e1_init(uint16_t rx_cr, uint16_t tx_cr); void e1_poll(void); void e1_debug_print(bool data); @@ -14,6 +17,17 @@ void e1_tx_config(uint16_t cr); void e1_rx_config(uint16_t cr); + +/* data flow */ + +unsigned int e1_rx_need_data(unsigned int usb_addr, unsigned int max_len, unsigned int *pos); +unsigned int e1_tx_feed_data(unsigned int usb_addr, unsigned int len); +unsigned int e1_tx_level(void); +unsigned int e1_rx_level(void); + + +/* error reporting */ + #define E1_ERR_F_ALIGN_ERR 0x01 #define E1_ERR_F_LOS 0x02 #define E1_ERR_F_RAI 0x04 @@ -28,6 +42,9 @@ const struct e1_error_count *e1_get_error_count(void); + +/* external function provided by the platform; used by E1 driver to control LEDs */ + enum e1_platform_led { E1P_LED_GREEN = 0, E1P_LED_YELLOW = 1, @@ -40,6 +57,5 @@ E1P_LED_ST_BLINK_FAST = 3 }; -/* external function provided by the platform; used by E1 driver to control LEDs */ extern void e1_platform_led_set(uint8_t port, enum e1_platform_led led, enum e1_platform_led_state state); diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index b4d8839..34ade71 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -15,7 +15,6 @@ #include "console.h" #include "misc.h" #include "e1.h" -#include "e1_hw.h" #include "ice1usb_proto.h" @@ -41,13 +40,6 @@ }; -/* Hack */ -unsigned int e1_rx_need_data(unsigned int usb_addr, unsigned int max_len, unsigned int *pos); -unsigned int e1_tx_feed_data(unsigned int usb_addr, unsigned int len); -unsigned int e1_tx_level(void); -unsigned int e1_rx_level(void); -/* ---- */ - static void _usb_fill_feedback_ep(void) { -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Icc2a6ef6b03c89dd92e661a01d219e42dbf7067d Gerrit-Change-Number: 26832 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 6 months

2
2
0 0

2025

2024

2023

2022

gerrit-log