Version 57 - History - Code-audit - Nuttx-bb - Open Source Mobile Communications

Code-audit » History » Version 57

gnutoo, 02/19/2016 10:49 PM

 gnutoo
 h2. Introduction
-gnutoo
+This page is a code audit that:
-gnutoo
+* Verify if the license are correct(not copied from osmocom-bb and changed from GPL to BSD)
 * permit to view the license of each file, that's important for the inclusion into the official nuttx that only accepts BSD code for the non-applications part.
 h2. Audit
-gnutoo
+Currently the following files were added or modified by nuttx-bb(on top of nuttx):
-gnutoo
+<pre>
-gnutoo
+ apps/examples/calypsotest/Makefile
  apps/examples/calypsotest/bounce_analyze.c
  apps/examples/calypsotest/main.c
-gnutoo
+ apps/examples/ostest/main.c
-gnutoo
+ nuttx/arch/arm/include/calypso/armio.h         OK,BSD only definitions of functions
-gnutoo
+ nuttx/arch/arm/include/calypso/clock.h         no license, copied from omsocombb's src/target/firmware/include/clock.h(which has no license too)
  nuttx/arch/arm/include/calypso/debug.h         no license, copied from omsocombb's src/target/firmware/include/debug.h(which has no license too), debug macros
-gnutoo
+ nuttx/arch/arm/include/calypso/defines.h       no license, copied from osmocombb's src/target/firmware/include/defines.h(which has no license too), trivial defines like #define +unused attribute+((unused))
-gnutoo
+ nuttx/arch/arm/include/calypso/irq.h           GPL, copyright Harald Welte and Stefan Richter
-gnutoo
+ nuttx/arch/arm/include/calypso/memory.h        no license,copied from osmocombb's src/target/firmware/include/memory.h(which has no license too),  trivial defines like #define readb(a) +arch_getb(a)
-gnutoo
+ nuttx/arch/arm/include/calypso/timer.h         no license, copied from osmocombb's src/target/firmware/include/timer.h(which has no license too), only definitions of functions
  nuttx/arch/arm/src/Makefile                    OK,BSD
-gnutoo
+ nuttx/arch/arm/src/calypso/Make.defs           OK,BSD
-gnutoo
+ nuttx/arch/arm/src/calypso/calypso_armio.c     BSD,copyright Stefan Richter, seem ok(grep found nothing in osmocom-bb)
-gnutoo
+ nuttx/arch/arm/src/calypso/calypso_head.S      no license, specific to nuttx( it jumps to functions like up_ which are nuttx functions)
-gnutoo
+ nuttx/arch/arm/src/calypso/calypso_heap.c      problematic?, see below
-gnutoo
+ nuttx/arch/arm/src/calypso/calypso_irq.c       OK,GPL, copied from osmocombb's src/target/firmware/calypso/irq.c , copyright Harald Welte and Stefan Richter
-gnutoo
+ nuttx/arch/arm/src/calypso/calypso_keypad.c    OK,BSD, totally different from osmocom-bb's src/target/firmware/calypso/keypad.c
-gnutoo
+ nuttx/arch/arm/src/calypso/calypso_lowputc.S   OK,BSD, not found in osmocom-bb source
-gnutoo
+ nuttx/arch/arm/src/calypso/calypso_serial.c    OK,BSD, based on nuttx/arch/arm/src/c5471/c5471_serial.c from nuttx (verified with diff)
-gnutoo
+ nuttx/arch/arm/src/calypso/calypso_spi.c       OK,BSD, wrapper arround osmocombb's SPI, incomplete
-gnutoo
+ nuttx/arch/arm/src/calypso/calypso_timer.c     OK,GPL, copyright Harald Welte and Stefan Richter
-gnutoo
+ nuttx/arch/arm/src/calypso/chip.h              OK,BSD,based on nuttx/arch/arm/src/c5471/chip.h
-gnutoo
+ nuttx/arch/arm/src/calypso/clock.c             OK,GPL, copyright Harald Welte
-gnutoo
+ nuttx/arch/arm/src/common/up_internal.h        OK,BSD,trivial modification(part of nuttx)
  nuttx/configs/compal_e88/calypsotest/Make.defs OK,BSD
  nuttx/configs/compal_e88/calypsotest/appconfig OK,BSD
  nuttx/configs/compal_e88/calypsotest/defconfig OK,BSD
  nuttx/configs/compal_e88/calypsotest/setenv.sh OK,BSD
  nuttx/configs/compal_e88/include/board.h       OK,BSD
  nuttx/configs/compal_e88/ld.script             OK,BSD
  nuttx/configs/compal_e88/nsh/Make.defs         OK,BSD
  nuttx/configs/compal_e88/nsh/appconfig         OK,BSD
  nuttx/configs/compal_e88/nsh/defconfig         OK,BSD
  nuttx/configs/compal_e88/nsh/ld.script         OK,BSD
  nuttx/configs/compal_e88/nsh/setenv.sh         OK,BSD
  nuttx/configs/compal_e88/ostest/Make.defs      OK,BSD
  nuttx/configs/compal_e88/ostest/appconfig      OK,BSD
  nuttx/configs/compal_e88/ostest/defconfig      OK,BSD
  nuttx/configs/compal_e88/ostest/setenv.sh      OK,BSD
  nuttx/configs/compal_e88/src/Make.dep          OK,BSD
  nuttx/configs/compal_e88/src/Makefile          OK,BSD
  nuttx/configs/compal_e88/src/dummy.c           OK,BSD
  nuttx/configs/compal_e99/calypsotest/Make.defs OK,BSD
  nuttx/configs/compal_e99/calypsotest/appconfig OK,BSD
  nuttx/configs/compal_e99/calypsotest/defconfig OK,BSD
  nuttx/configs/compal_e99/calypsotest/setenv.sh OK,BSD
  nuttx/configs/compal_e99/include/board.h       OK,BSD
  nuttx/configs/compal_e99/ld.script             OK,BSD
  nuttx/configs/compal_e99/nsh/Make.defs         OK,BSD
  nuttx/configs/compal_e99/nsh/appconfig         OK,BSD
  nuttx/configs/compal_e99/nsh/defconfig         OK,BSD
  nuttx/configs/compal_e99/nsh/ld.script         OK,BSD
  nuttx/configs/compal_e99/nsh/setenv.sh         OK,BSD
  nuttx/configs/compal_e99/ostest/Make.defs      OK,BSD
  nuttx/configs/compal_e99/ostest/appconfig      OK,BSD
  nuttx/configs/compal_e99/ostest/defconfig      OK,BSD
  nuttx/configs/compal_e99/ostest/setenv.sh      OK,BSD
  nuttx/configs/compal_e99/src/Makefile          OK,BSD
-gnutoo
+ nuttx/configs/compal_e99/src/dummy.c           OK,BSD
-gnutoo
+ nuttx/drivers/Makefile                         OK,BSD
-gnutoo
+ nuttx/drivers/sercomm/Make.defs                OK,BSD
-gnutoo
+ nuttx/drivers/sercomm/console.c                mostly OK(see below), BSD
  nuttx/drivers/sercomm/loadwriter.py            no copyright at all, small enough
  nuttx/drivers/sercomm/uart.c                   OK,GPL, copyright Harald Welte and Ingo Albrecht
  nuttx/drivers/sercomm/uart.h                   no license, copied from osmocom-bb's src/target/firmware/include/uart.h which had no license too
  nuttx/include/nuttx/spi.h                      OK,BSD, only small change made
  nuttx/include/sercomm/msgb.h                   OK,GPL,copyright Harald Welte
  nuttx/include/sercomm/sercomm.h                copy of src/target/firmware/include/comm/sercomm.h, no license in both.
  nuttx/include/sercomm/sercomm_cons.h           no license,copied from osmocom-bb's src/target/firmware/include/comm/sercomm_cons.h which had no license, interface only(only 2 definitions of functions inside)
 files changed, 9221 insertions(+), 3 deletions(-)
-gnutoo
+</pre>
 gnutoo
 We can safely assume that the config dir weren't took from osmocom-bb.
 gnutoo
 h2. init.c and console.c ==
  nuttx-bb ===
 * Copyright Stefan Richter
 * BSD License
 * nuttx/drivers/sercomm/console.c
 <pre>
-gnutoo
+        /* XXX: initialize MODEMUART to be used for sercomm*/
-gnutoo
+        uart_init(SERCOMM_UART_NR, 1);
         uart_baudrate(SERCOMM_UART_NR, UART_115200);
-gnutoo
+</pre>
 h3. osmocom-bb
 * GPL
 * Copyright Harald Welte and Steve Markgraf
 * src/target/firmware/board/compal_e99/init.c
 <pre>
-gnutoo
+        /* initialize MODEM UART to be used for sercomm*/
         uart_init(SERCOMM_UART_NR, 1);
         uart_baudrate(SERCOMM_UART_NR, UART_115200);
-gnutoo
+</pre>
 gnutoo
-gnutoo
+h2. calypsotest/bounce_analyze.c ==
  nuttx-bb ===
 * Copyright Stefan Richter
 * GPL License (could keep as GPL since it is an application)
 * apps/examples/calypsotest/bounce_analyze.c
 gnutoo
-gnutoo
+h3. osmocom-bb
 * nothing found
 h2. calypsotest/main.c ==
  nuttx-bb ===
 * Copyright Stefan Richter
 * BSD License
 * apps/examples/calypsotest/main.c
 <pre>
-gnutoo
+static void lights_on(void)
+{
 	uint16_t reg;
-gnutoo
+	reg = readw(ASIC_CONF_REG);
 	/* LCD Set I/O(3) / SA0 to I/O(3) mode */
 	reg &= ~( (1 << 12) | (1 << 10) | (1 << 7) | (1 << 1)) ;
 	/* don't set function pins to I2C Mode, C155 uses UWire */
 	/* TWL3025: Set SPI+RIF RX clock to rising edge */
 	reg |= (1 << 13) | (1 << 14);
 	writew(reg, ASIC_CONF_REG);
 	/* LCD Set I/O(3) to output mode and enable C155 backlight (IO1) */
 	/* FIXME: Put the display backlight control to backlight.c */
 	reg = readw(IO_CNTL_REG);
 	reg &= ~( (1 << 3) | (1 << 1));
 	writew(reg, IO_CNTL_REG);
 	/* LCD Set I/O(3) output low */
 	reg = readw(ARMIO_LATCH_OUT);
 	reg &= ~(1 << 3);
 	reg |= (1 << 1);
 	writew(reg, ARMIO_LATCH_OUT);
+}
-gnutoo
+</pre>
 h3. osmocom-bb
 * Copyright Harald Welte and Steve Markgraf
 * GPL License
 * src/target/firmware/board/compal_e99/init.c
 <pre>
-gnutoo
+static void board_io_init(void)
+{
 	uint16_t reg;
 	reg = readw(ASIC_CONF_REG);
 	/* LCD Set I/O(3) / SA0 to I/O(3) mode */
 	reg &= ~( (1 << 12) | (1 << 10) | (1 << 7) | (1 << 1)) ;
 	/* don't set function pins to I2C Mode, C155 uses UWire */
-gnutoo
+	/* TWL3025: Set SPI+RIF RX clock to rising edge */
 	reg |= (1 << 13) | (1 << 14);
 	writew(reg, ASIC_CONF_REG);
 	/* LCD Set I/O(3) to output mode and enable C155 backlight (IO1) */
 	/* FIXME: Put the display backlight control to backlight.c */
 	reg = readw(IO_CNTL_REG);
 	reg &= ~( (1 << 3) | (1 << 1));
-gnutoo
+	writew(reg, IO_CNTL_REG);
-gnutoo
+	/* LCD Set I/O(3) output low */
 	reg = readw(ARMIO_LATCH_OUT);
 	reg &= ~(1 << 3);
 	reg |= (1 << 1);
 	writew(reg, ARMIO_LATCH_OUT);
+}
-gnutoo
+</pre>
 gnutoo
-gnutoo
+h2. ostest/main.c ==
  nuttx-bb ===
 * Copyright Gregory Nutt
 * BSD License
 * apps/examples/ostest/main.c
 * Note: lights_on function used snippet code of [[OsmocomBB]] src/target/firmware/board/compal_e99/init.c
 gnutoo
-gnutoo
+h3. osmocom-bb
 gnutoo
-gnutoo
+* nothing found
 h2. calypso/calypso_armio.c ==
  nuttx-bb ===
 * Copyright Stefan Richter
 * BSD License
 * nuttx/arch/arm/src/calypso/calypso_armio.c
 h3. osmocom-bb
 * nothing found
 h2. calypso/calypso_head.S ==
  nuttx-bb ===
 * No copyright
 * No License
 * nuttx/arch/arm/src/calypso/calypso_head.S
 * Note: this is same file as nuttx/arch/arm/src/chip/calypso_head.S
 h3. osmocom-bb
 * nothing found
 h2. calypso/calypso_irq.c ==
  nuttx-bb ===
 * Copyright Harald Welte and Stefan Richter
 * GPL License (need change to BSD)
 * nuttx/arch/arm/src/calypso/calypso_irq.c
 <pre>
-gnutoo
+static void _irq_enable(enum irq_nr nr, int enable)
 gnutoo
 	uint16_t *reg = IRQ_REG(MASK_IT_REG1);
 	uint16_t val;
 	if (nr > 15) {
 		reg = IRQ_REG(MASK_IT_REG2);
 		nr -= 16;
+	}
 	val = readw(reg);
 	if (enable)
-gnutoo
+		val &= ~(1 << nr);
 	else
 		val |= (1 << nr);
 	writew(val, reg);
+}
-gnutoo
+</pre>
 h3. osmocom-bb
 * Copyright Harald Welte
 * GPL License
 * src/target/firmware/calypso/irq.c
 <pre>
-gnutoo
+static void _irq_enable(enum irq_nr nr, int enable)
+{
 	uint16_t *reg = IRQ_REG(MASK_IT_REG1);
 	uint16_t val;
-gnutoo
+	if (nr > 15) {
-gnutoo
+		reg = IRQ_REG(MASK_IT_REG2);
 		nr -= 16;
+	}
-gnutoo
+	val = readw(reg);
 	if (enable)
-gnutoo
+		val &= ~(1 << nr);
 	else
 		val |= (1 << nr);
 	writew(val, reg);
+}
-gnutoo
+</pre>
 gnutoo
-gnutoo
+h2. calypso_keypad.c ==
  nuttx-bb ===
 * Copyright Stefan Richter
 * BSD License
 * nuttx/arch/arm/src/calypso/calypso_keypad.c
 gnutoo
-gnutoo
+h3. osmocom-bb
 * nothing found
 h2. calypso_timer.c ==
  nuttx-bb ===
 * Copyright Harald Welte and Stefan Richter
 * GPL License (need change to BSD)
 * nuttx/arch/arm/src/calypso/calypso_timer.c
 * Note: verbatim copy from [[OsmocomBB]] calypso/timer.c
 h3. osmocom-bb
 * Copyright Harald Welte
 * GPL License
 * src/target/firmware/calypso/timer.c
 h2. init.c and calypso_heap.c ==
  nuttx-bb ===
 * Copyright Stefan Richter
 * BSD License
 * nuttx/arch/arm/src/calypso/calypso_heap.c
 <pre>
-gnutoo
+void up_addregion(void)
+{
 #ifdef CONFIG_ARCH_BOARD_COMPALE99
-gnutoo
+        /* Disable watchdog in first non-common function */
-gnutoo
+        wdog_enable(0);
 #endif
         // XXX: change to initialization of extern memory with save defaults
         /* Configure memory interface */
         calypso_mem_cfg(CALYPSO_nCS0, 3, CALYPSO_MEM_16bit, 1);
         calypso_mem_cfg(CALYPSO_nCS1, 3, CALYPSO_MEM_16bit, 1);
         calypso_mem_cfg(CALYPSO_nCS2, 5, CALYPSO_MEM_16bit, 1);
         calypso_mem_cfg(CALYPSO_nCS3, 5, CALYPSO_MEM_16bit, 1);
         calypso_mem_cfg(CALYPSO_CS4, 0, CALYPSO_MEM_8bit, 1);
         calypso_mem_cfg(CALYPSO_nCS6, 0, CALYPSO_MEM_32bit, 1);
         calypso_mem_cfg(CALYPSO_nCS7, 0, CALYPSO_MEM_32bit, 0);
         /* Set VTCXO_DIV2 = 1, configure PLL for 104 MHz and give ARM half of that */
         calypso_clock_set(2, CALYPSO_PLL13_104_MHZ, ARM_MCLK_DIV_2);
         /* Configure the RHEA bridge with some sane default values */
         calypso_rhea_cfg(0, 0, 0xff, 0, 1, 0, 0);
+}
-gnutoo
+</pre>
 h3. Osmocom-bb
 * GPL
 * Copyright Harald Welte and Steve Markgraf
 * src/target/firmware/board/compal_e99/init.c
 <pre>
-gnutoo
+void board_init(void)
+{
         /* Disable watchdog (compal loader leaves it enabled) */
         wdog_enable(0);
         /* Configure memory interface */
         calypso_mem_cfg(CALYPSO_nCS0, 3, CALYPSO_MEM_16bit, 1);
         calypso_mem_cfg(CALYPSO_nCS1, 3, CALYPSO_MEM_16bit, 1);
         calypso_mem_cfg(CALYPSO_nCS2, 5, CALYPSO_MEM_16bit, 1);
         calypso_mem_cfg(CALYPSO_nCS3, 5, CALYPSO_MEM_16bit, 1);
         calypso_mem_cfg(CALYPSO_CS4, 0, CALYPSO_MEM_8bit, 1);
         calypso_mem_cfg(CALYPSO_nCS6, 0, CALYPSO_MEM_32bit, 1);
-gnutoo
+        calypso_mem_cfg(CALYPSO_nCS7, 0, CALYPSO_MEM_32bit, 0);
-gnutoo
+        /* Set VTCXO_DIV2 = 1, configure PLL for 104 MHz and give ARM half of that */
         calypso_clock_set(2, CALYPSO_PLL13_104_MHZ, ARM_MCLK_DIV_2);
-gnutoo
+        /* Configure the RHEA bridge with some sane default values */
         calypso_rhea_cfg(0, 0, 0xff, 0, 1, 0, 0);
-gnutoo
+</pre>
 h2. Relicensing permissions
 * "Harald Welte":http://lists.osmocom.org/pipermail/baseband-devel/2012-February/002813.html
 * Ingo Albrecht:
-gnutoo
+By private mail
-gnutoo
+<pre>
-gnutoo
+I am open to relicensing and other such agreements.
-gnutoo
+</pre>
 * Stefan Richter:
-gnutoo
+By private mail
-gnutoo
+<pre>
-gnutoo
+Sure, go ahead. I don't mind which license but we agreed (I think) to
 use the nuttx one. Mostly such that we can submit to upstream some day
-gnutoo
+if desired.
-gnutoo
+</pre>
 * Denis Carikli
 * Alan Carvalho de Assis
 * "Sylvain Munaut":http://lists.osmocom.org/pipermail/baseband-devel/2012-May/002967.html:
 ** src/target/firmware/calypso/uwire.c has permission
 ** "anything close to the GSM function (dsp / tsp / l1 / ....)." does *not* have permission
 * Steve Markgraf
-gnutoo
+On the #osmocom channel on Freenode IRC server:
-gnutoo
+<pre>
-gnutoo
+May 13 21:55:40 <GNUtoo-desktop>	hi steve|m, we need permission for relicensing the commit a13a4fda926aa272e55964c8f86cb31fb4065995 (uwire: add a chip-select for CS0, needed by the J100i display) for inclusion in nuttx(BSD licensed).
 May 13 22:00:03 <steve|m>	I don't mind such trivial changes being relicensed, but I second what tnt stated on the ml, for the actual GSM parts of the code that's different
-gnutoo
+</pre>
 gnutoo
 gnutoo
 h2. Listing authors by file
 <pre>
-gnutoo
+src/target/firmware/calypso/irq.c:
 Author: Harald Welte <laforge@gnumonks.org>
 src/target/firmware/calypso/timer.c:
 Author: Harald Welte <laforge@gnumonks.org>
 Author: Ingo Albrecht <prom@berlin.ccc.de>
 src/target/firmware/calypso/clock.c:
 Author: Harald Welte <laforge@gnumonks.org>
 Author: Ingo Albrecht <prom@berlin.ccc.de> (very small modifications)
 Author: Steve Markgraf <steve@steve-m.de> (very small modifications)
 src/target/firmware/calypso/uart.c:
 Author: Alex Badea <vamposdecampos@gmail.com> (very small modifications)
 Author: Christian Vogel <vogelchr@vogel.cx>
 Author: Harald Welte <laforge@gnumonks.org>
 Author: Ingo Albrecht <prom@berlin.ccc.de>
 Author: Wolfram Sang <wolfram@the-dreams.de> (very small modifications)
 src/target/firmware/board/compal_e99/init.c:
 Author: Harald Welte <laforge@gnumonks.org>
 Author: Ingo Albrecht <prom@berlin.ccc.de> (small modifications)
 Author: Steve Markgraf <steve@steve-m.de>
 Author: Wolfram Sang <wolfram@the-dreams.de> (very small modifications)
-gnutoo
+</pre>

This project is currently umaintained. Please contact laforge if you would like to revive it.

Project

General

Profile

OsmocomBB » Nuttx-bb

Code-audit » History » Version 57