Commit Graph

8996 Commits

Author SHA1 Message Date
Oliver Schmidt
f13316415f Merge pull request #509 from oliverschmidt/master
Now that all supported targets echo the Return key on gets() there's no more need to print \n's.
2013-12-26 07:59:08 -08:00
Oliver Schmidt
f6940903a0 Now that all supported targets echo the Return key on gets() there's no more need to print \n's. 2013-12-26 16:12:39 +01:00
Adam Dunkels
9275322b51 Merge pull request #502 from adamdunkels/push/fix-the-ipv6-bugfix
Fix the IPv6 bugfix
2013-12-16 13:52:14 -08:00
Adam Dunkels
a8295404cc Merge pull request #498 from adamdunkels/push/contiki-3.x
Bump the version number in the development branch
2013-12-12 23:19:10 -08:00
Oliver Schmidt
942d4dae7b Merge pull request #501 from oliverschmidt/master
Have CBM DOS filetype of imported files match the one used by cc65.
2013-12-12 14:16:55 -08:00
Adam Dunkels
a6a081e67d Fixed a severe error in the bugfix: the conditional was reversed. The check must be if the TCP MSS is larger than the BUFSIZE and not the other way around. 2013-12-12 22:43:28 +01:00
Adam Dunkels
ef83850e63 Removed redundant #ifdef 2013-12-12 22:20:20 +01:00
Adam Dunkels
c0b3c87ba7 Make 0 the default link-layer header length, as far as uIP is concerned. Most currently used linke layers (specifically, 802.15.4) has adaptation layers that use separate buffers, so there is no need to reserve space in the uIP buffer. 2013-12-12 22:20:09 +01:00
Adam Dunkels
c7e0fa7152 Moved #defines so that UIP_TCPIP_HLEN and UIP_LLH_LEN are defined before they are used 2013-12-12 20:57:35 +01:00
Oliver Schmidt
63725eff36 Merge remote-tracking branch 'upstream/master' 2013-12-12 20:46:43 +01:00
Oliver Schmidt
3b2173e01f Have CBM DOS filetype of imported files match the one used by cc65.
CFS_WRITE implies O_TRUNC which is implemented on CBM DOS by deleting an
exsisting file. Hoewever this succeeds only if the CBM DOS filetype matches.

We need a working O_TRUNC in order to be able to overwrite the contiki.cfg
configuration file.

Note: Now it has be clarified why overwriting the configuration file started to
fail the CBM PFS (platform file system) can be activated for the recently added
ethconfig program.
2013-12-12 18:57:40 +01:00
Adam Dunkels
ae5a3f9f67 Bumped the version number from 2.6 to 3.x, which is to be used in the development branch 2013-12-12 17:33:18 +01:00
Mariano Alvira
5c21abf076 Merge pull request #155 from cetic/travis-slip-radio
Travis test for slip-radio
2013-12-12 07:13:17 -08:00
Nicolas Tsiftes
a8a9b66eff Merge pull request #457 from adamdunkels/push/uip6-bugfixes
IPv6 bugfixes
2013-12-12 05:02:39 -08:00
Sébastien Dawans
d772baa37d Travis test for slip-radio 2013-12-09 21:06:37 +01:00
George Oikonomou
79e6514c80 Merge pull request #494 from ADVANSEE/cc2538-lpm-fixes
cc2538: lpm: Fix several issues
2013-12-05 15:27:28 -08:00
Benoît Thébaudeau
5261bb861d cc2538: lpm: Fix RTIMER_NOW() upon wake-up
When returning from PM1/2, the sleep timer value (used by RTIMER_NOW()) is not
up-to-date until a positive edge on the 32-kHz clock has been detected after the
system clock restarted. To ensure an updated value is read, wait for a positive
transition on the 32-kHz clock by polling the SYS_CTRL_CLOCK_STA.SYNC_32K bit,
before reading the sleep timer value.

Because of this RTIMER_NOW() fixup, lpm_exit() has to be called at the very
beginning of ISRs waking up the SoC. This also ensures that all clocks and
timers are enabled at the correct frequency and updated before using them
following wake-up.

Without this fix, etimers could sometimes (randomly, depending on timings)
become ultra slow (observed from 10x to 40x slower than normal) if the system
exited PM1/2 very often. This issue occurred more often with PM1.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-12-05 20:23:29 +01:00
Benoît Thébaudeau
f149197aa8 cc2538: lpm: Speed up the transition to the 32-MHz XOSC after wake-up
As recommended by the CC2538 User's Guide, set SYS_CTRL_CLOCK_CTRL.OSC_PD to 0
before asserting WFI, and set it to 1 after the system clock is sourced from the
32-MHz XOSC following wake-up. This allows to automatically start both
oscillators upon wake-up in order to partially hide the 32-MHz XOSC startup time
by the 16-MHz RCOSC startup time.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-12-05 20:23:29 +01:00
Benoît Thébaudeau
13006e1c73 cc2538: lpm: Let system clock transitions complete before further changes
As a matter of precaution, always make sure that pending system clock
transitions are complete before requesting a new change of the system clock
source.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-12-05 20:23:29 +01:00
Benoît Thébaudeau
8514a91ea9 cc2538: lpm: Fix energest context when aborting lpm_enter()
In one of the abort cases in lpm_enter(), the energest context has previously
been set to LPM, so the abort code needs to set it back to CPU.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-12-05 20:23:29 +01:00
George Oikonomou
f2c552bb55 Merge pull request #478 from ADVANSEE/cc2538-startup-cleanup
cc2538: Startup cleanup
2013-12-05 11:07:19 -08:00
George Oikonomou
63298843b3 Merge pull request #491 from g-oikonomou/remove-lpp-from-readme
Remove LPP discussion from the cc2538 README
2013-12-05 11:07:03 -08:00
George Oikonomou
17b2150081 Merge pull request #463 from ADVANSEE/cc2538-ports-pins
cc2538: Clean up and improve port and pin definitions
2013-12-05 10:31:29 -08:00
George Oikonomou
6f22fd6642 Remove LPP discussion from the cc2538 README 2013-12-05 18:16:22 +00:00
Benoît Thébaudeau
a2686e581e cc2538: Add header file for flash CCA page and use it
Create a dedicated header file with all the definitions for the flash lock bit
page and customer configuration area. This avoids duplicating those definitions
in the startup-gcc.c files of all CC2538-based platforms, and this also allows
to easily manipulate the CCA from outside startup-gcc.c (e.g. for on-the-air
firmware update).

The definitions are now complete contrary to what was in startup-gcc.c:
 - Definitions have been added to select the bootloader backdoor pin and active
   level if enabled.
 - Definitions have been added to access the page and debug lock bits. The debug
   lock bit can be used to prevent someone from reading back a programmed
   firmware through JTAG if the firmware binary image has to be confidential,
   which should be combined with a disabled bootloader backdoor.
 - The application entry point is now tied to the beginning of the .text section
   instead of to the beginning of the flash. This allows projects using custom
   linker scripts to place the application entry point anywhere in the flash,
   which can be useful e.g. for on-the-air firmware update.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-12-05 18:45:51 +01:00
Benoît Thébaudeau
65806f53eb cc2538dk: startup-gcc: Do not redefine SYS_CTRL_EMUOVR
SYS_CTRL_EMUOVR is already defined in sys-ctrl.h, so #include this header file
instead of redefining SYS_CTRL_EMUOVR in startup-gcc.c.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
2013-12-05 18:41:49 +01:00
George Oikonomou
8b003c30c7 Merge pull request #471 from ADVANSEE/cc2538-gpio-power-up
cc2538: gpio: Add support for power up
2013-12-05 09:25:05 -08:00
George Oikonomou
97cdf39b95 Merge pull request #464 from ADVANSEE/cc2538-pm2-sram
cc2538: lpm: Give access to the SRAM non-retention area for PM2
2013-12-05 09:19:22 -08:00
George Oikonomou
acebfa2932 Merge pull request #466 from ADVANSEE/cc2538dk-slip-enable
cc2538dk: Make it possible to override SLIP_ARCH_CONF_ENABLED
2013-12-05 09:11:38 -08:00
Nicolas Tsiftes
75cbf4f48a Merge pull request #479 from adamdunkels/push/cleanup-xmac-and-lpp
Remove xmac.c and lpp.c
2013-12-04 04:57:27 -08:00
Adam Dunkels
d85cb0604d Merge pull request #484 from adamdunkels/push/travis-fix
Partial fix for travis
2013-12-04 00:06:17 -08:00
Oliver Schmidt
9a48bcf941 Merge pull request #488 from oliverschmidt/master
Avoid access to the address register during auto-increment.
2013-12-03 12:59:45 -08:00
Oliver Schmidt
8386be428c Merge remote-tracking branch 'upstream/master' 2013-12-03 21:41:16 +01:00
Oliver Schmidt
9cdc6da040 Avoid access to the address register during auto-increment.
It cannot be ruled out that access to the address register triggers
an address auto-increment. Therefore a temporary address register
shadow is introduced to replace the access to the address regsiter.

Additionally there are several minor beautifications.
2013-12-03 21:31:43 +01:00
Adam Dunkels
eda816e789 Merge pull request #42 from g-oikonomou/remove-sensinode-tests
Remove Sensinode tests from travis
2013-12-03 10:42:20 -08:00
George Oikonomou
d8d15fec67 Remove Sensinode tests from travis 2013-12-03 14:13:40 +00:00
Adam Dunkels
b01469907b Don't compile webserver-ipv6 for the sky platform, as it is a little too small. Use the larger exp5438 instead 2013-12-02 23:09:25 +01:00
Mariano Alvira
54719b75b8 Merge pull request #140 from cetic/slip-radio-platforms
Extend slip-radio example for Econotag and Nooliberry
2013-12-02 09:23:10 -08:00
Mariano Alvira
ab8fb6c396 Merge pull request #386 from chrta/stm32w_flasher_udev
In stm32w_flasher replaced hal-* calls with usage of pyudev.
2013-12-02 09:21:39 -08:00
Mariano Alvira
590b3f48a9 Merge pull request #477 from MariaLauraStefanizzi/eeprom
i2c and eeprom drivers for mbxxx boards
2013-12-02 09:20:14 -08:00
Mariano Alvira
86c593b7cd Merge pull request #481 from ismb-pert/fix-sleep
Fix sleep
2013-12-02 09:19:25 -08:00
Mariano Alvira
70215b634d Merge pull request #480 from hexluthor/upstream
Add a rule for generating assembly listings on mc1322x targets, for example: "make webserver6.lst".
2013-12-02 09:18:34 -08:00
Mariano Alvira
2ab24f4fc3 Merge pull request #387 from chrta/mb950_1_rev_B
Added support for STM32w boards MB950 and MB951 revision B.
2013-12-02 09:11:50 -08:00
Gianfranco Costamagna
ae27278714 Readded clock.c file, deleted in pull request #266, fixing issue #440 2013-12-02 11:38:07 +01:00
Gianfranco Costamagna
19a46266a5 Revert "Fixing sleep on stm32w108 cpu"
This reverts commit eac73ff68ce98e862def4bd671db03f7b9a3b438.
2013-12-02 11:37:53 +01:00
Ian Martin
0dafba4f6d Add a rule for generating assembly listings on mc1322x targets, for example: "make webserver6.lst". 2013-12-01 16:22:37 -05:00
Mariano Alvira
5fbefbd87b Merge pull request #459 from adamdunkels/push/mc1322x-stuff
MC1322x additions
2013-11-29 11:59:04 -08:00
Nicolas Tsiftes
7b1e3d1c94 Merge pull request #460 from adamdunkels/push/routelist
IPv6 routes LRU
2013-11-29 05:23:05 -08:00
Nicolas Tsiftes
65392ce59e Merge pull request #474 from adamdunkels/push/cleanup-vnc
Remove the VNC client and server
2013-11-29 05:07:53 -08:00
Christian Taedcke
0de2e6dded In stm32w_flasher adapted error message for missing pyudev. 2013-11-28 16:49:43 +01:00