Change in osmo-e1-hardware[master]: icE1usb fw: Don't expose some E1 helper functions globally
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@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@246tNt.com> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-MessageType: newchange
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26831 ) Change subject: icE1usb fw: Don't expose some E1 helper functions globally ...................................................................... Patch Set 1: Code-Review+2 -- 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@246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Comment-Date: Mon, 10 Jan 2022 13:51:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
laforge has submitted this change. ( 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@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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved 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@246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-MessageType: merged
participants (2)
-
laforge -
tnt