pespin has submitted this change. ( https://gerrit.osmocom.org/c/libusrp/+/34234 )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: cosmetic: fx2regs.h: Fix trailing whitespace
......................................................................
cosmetic: fx2regs.h: Fix trailing whitespace
Change-Id: Ie9e14cfb70168d0ff2bcdfb2695d3cb0f77cd5db
---
M firmware/include/fx2regs.h
1 file changed, 31 insertions(+), 22 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/firmware/include/fx2regs.h b/firmware/include/fx2regs.h
index dec5164..455b067 100644
--- a/firmware/include/fx2regs.h
+++ b/firmware/include/fx2regs.h
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* Copyright 2003 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
@@ -45,18 +45,18 @@
// FX2 Related Register Assignments
//-----------------------------------------------------------------------------
-// The Ez-USB FX2 registers are defined here. We use FX2regs.h for register
-// address allocation by using "#define ALLOCATE_EXTERN".
-// When using "#define ALLOCATE_EXTERN", you get (for instance):
+// The Ez-USB FX2 registers are defined here. We use FX2regs.h for register
+// address allocation by using "#define ALLOCATE_EXTERN".
+// When using "#define ALLOCATE_EXTERN", you get (for instance):
// __xdata volatile BYTE OUT7BUF[64] _at_ 0x7B40;
-// Such lines are created from FX2.h by using the preprocessor.
-// Incidently, these lines will not generate any space in the resulting hex
-// file; they just bind the symbols to the addresses for compilation.
-// You just need to put "#define ALLOCATE_EXTERN" in your main program file;
-// i.e. fw.c or a stand-alone C source file.
-// Without "#define ALLOCATE_EXTERN", you just get the external reference:
+// Such lines are created from FX2.h by using the preprocessor.
+// Incidently, these lines will not generate any space in the resulting hex
+// file; they just bind the symbols to the addresses for compilation.
+// You just need to put "#define ALLOCATE_EXTERN" in your main program file;
+// i.e. fw.c or a stand-alone C source file.
+// Without "#define ALLOCATE_EXTERN", you just get the external reference:
// extern __xdata volatile BYTE OUT7BUF[64] ;// 0x7B40;
-// This uses the concatenation operator "##" to insert a comment "//"
+// This uses the concatenation operator "##" to insert a comment "//"
// to cut off the end of the line, "_at_ 0x7B40;", which is not wanted.
*/
@@ -273,10 +273,10 @@
EXTERN __xdata _AT_(0xE6C8) volatile BYTE FLOWEQ0CTL ; //CTL states during active flow state
EXTERN __xdata _AT_(0xE6C9) volatile BYTE FLOWEQ1CTL ; //CTL states during hold flow state
EXTERN __xdata _AT_(0xE6CA) volatile BYTE FLOWHOLDOFF ;
-EXTERN __xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe
+EXTERN __xdata _AT_(0xE6CB) volatile BYTE FLOWSTB ; //CTL/RDY Signal to use as master data strobe
EXTERN __xdata _AT_(0xE6CC) volatile BYTE FLOWSTBEDGE ; //Defines active master strobe edge
EXTERN __xdata _AT_(0xE6CD) volatile BYTE FLOWSTBHPERIOD ; //Half Period of output master strobe
-EXTERN __xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift
+EXTERN __xdata _AT_(0xE60C) volatile BYTE GPIFHOLDAMOUNT ; //Data delay shift
EXTERN __xdata _AT_(0xE67D) volatile BYTE UDMACRCH ; //CRC Upper byte
EXTERN __xdata _AT_(0xE67E) volatile BYTE UDMACRCL ; //CRC Lower byte
EXTERN __xdata _AT_(0xE67F) volatile BYTE UDMACRCQUAL ; //UDMA In only, host terminated use only
@@ -308,8 +308,8 @@
/*-----------------------------------------------------------------------------
Special Function Registers (SFRs)
The byte registers and bits defined in the following list are based
- on the Synopsis definition of the 8051 Special Function Registers for EZ-USB.
- If you modify the register definitions below, please regenerate the file
+ on the Synopsis definition of the 8051 Special Function Registers for EZ-USB.
+ If you modify the register definitions below, please regenerate the file
"ezregs.inc" which includes the same basic information for assembly inclusion.
-----------------------------------------------------------------------------*/
@@ -385,9 +385,9 @@
__sfr __at 0x9A APTR1H;
__sfr __at 0x9B APTR1L;
-__sfr __at 0x9C AUTODAT1;
+__sfr __at 0x9C AUTODAT1;
__sfr __at 0x9D AUTOPTRH2;
-__sfr __at 0x9E AUTOPTRL2;
+__sfr __at 0x9E AUTOPTRL2;
__sfr __at 0x9F AUTODAT2;
__sfr __at 0xA0 IOC;
__sfr __at 0xA1 INT2CLR;
@@ -446,7 +446,7 @@
__sfr __at 0xBA EP01STAT;
__sfr __at 0xBB GPIFTRIG;
-
+
__sfr __at 0xBD GPIFSGLDATH;
__sfr __at 0xBE GPIFSGLDATLX;
__sfr __at 0xBF GPIFSGLDATLNOX;
@@ -666,7 +666,7 @@
/*
* Chip Revision Control Bits (REVCTL) - used to ebable/disable revision specific features
- */
+ */
#define bmNOAUTOARM bmBIT1 // these don't match the docs
#define bmSKIPCOMMIT bmBIT0 // these don't match the docs
--
To view, visit https://gerrit.osmocom.org/c/libusrp/+/34234
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libusrp
Gerrit-Branch: master
Gerrit-Change-Id: Ie9e14cfb70168d0ff2bcdfb2695d3cb0f77cd5db
Gerrit-Change-Number: 34234
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: pespin.
Hello osmith, Jenkins Builder, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libusrp/+/34235
to look at the new patch set (#2).
Change subject: Fix compilation with newer sdcc
......................................................................
Fix compilation with newer sdcc
Since recent system upgrade which pulled in sdcc 4.3.0, build fails with
following error:
/git/libusrp/firmware/include/fx2regs.h:324: syntax error: token -> '+' ; column 26
It seems newer sdcc doesn't like having sums directly in there. Using
parenthesis around the expression fixes the problem.
Related: OS#6157
Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea
---
M firmware/include/fx2regs.h
M firmware/src/usrp2/usrp_rev2_regs.h
2 files changed, 92 insertions(+), 75 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/35/34235/2
--
To view, visit https://gerrit.osmocom.org/c/libusrp/+/34235
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libusrp
Gerrit-Branch: master
Gerrit-Change-Id: Iccc0b1ffe95971957f16008c3e3b873d065ba0ea
Gerrit-Change-Number: 34235
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194 )
Change subject: PCUIF: use confirm flag in struct gsm_pcu_if_pch
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34194
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I7017ca20ca7e0b77d0f363121e4f17280e39e8ac
Gerrit-Change-Number: 34194
Gerrit-PatchSet: 3
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 29 Aug 2023 12:01:47 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34209 )
Change subject: BTS_Tests: use f_PCUIF_tx_mac_block_agch in TC_pcu_data_req_agch
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34209
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I341bbd01e8132fab913d307bfb4b2fb873cdde3c
Gerrit-Change-Number: 34209
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 29 Aug 2023 12:00:48 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066 )
Change subject: PCUIF: Add support for PCU_IF_SAPI_AGCH_2
......................................................................
Patch Set 3: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34066
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I40e05a2e68cca77d3c2f41df9af8d35762488abf
Gerrit-Change-Number: 34066
Gerrit-PatchSet: 3
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 29 Aug 2023 12:00:32 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment