Commit graph

35 commits

Author SHA1 Message Date
Mariano Alvira 2c9a538582 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into bump-libmc1322x
bump libmc1322x to 7bee48243c

Conflicts:
	cpu/mc1322x/board/Makefile.board
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/lib/uart1.c
	cpu/mc1322x/lib/uart2.c
	cpu/mc1322x/src/default_lowlevel.c
2012-11-18 18:27:39 -05:00
Adam Dunkels 944537fccf Removed all old RCS tags in the Contiki source tree. Those RCS tags are not used any more, as we are now using git to manage the Contiki source tree 2012-10-26 15:54:49 +02:00
Mariano Alvira 2b9f4e8fed Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x 2011-08-01 19:50:46 -04:00
Mariano Alvira 485d6716e0 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x
Conflicts:
	cpu/mc1322x/src/default_lowlevel.c
2011-07-18 07:25:19 -04:00
Mariano Alvira e80f9eb4b5 mc1322x: build fixes for uart2 2011-07-08 19:40:42 -04:00
Mariano Alvira e2d74fa0a5 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into uart-upstream
Conflicts:
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/src/default_lowlevel.c
2011-07-08 19:21:15 -04:00
dak664 2e14df3981 Options to extend mc1322x fifo to RAM buffer, or use hardware flow control with tunslip6. 2011-04-08 15:15:16 -04:00
Mariano Alvira 11f5bca7c4 Merge remote branch 'libmc1322x/master'
Conflicts:
	cpu/mc1322x/board/redbee-econotag.h
2011-03-22 16:28:08 -04:00
Mariano Alvira 59d7fad746 Merge remote branch 'libmc1322x/master' 2011-03-11 16:28:14 -05:00
Mariano Alvira fa08b09770 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into update-lib 2011-03-07 12:37:26 -05:00
Mariano Alvira 07f77b02eb Merge remote branch 'libmc1322x/master' 2011-02-18 12:38:30 -05:00
Mariano Alvira 2e331b51e8 Merge remote branch 'libmc1322x/master' into update-libmc1322x
Conflicts:
	cpu/mc1322x/COPYING
2011-02-17 14:41:47 -05:00
Mariano Alvira 7cdfbb0947 remove cvs keywords from cpu/mc1322x 2011-02-17 14:36:55 -05:00
maralvira b3c8c14b7d add timer setup routines 2011-01-17 15:51:02 +00:00
maralvira 9b2a2bb5e6 fix up stdint include 2010-11-10 22:12:29 +00:00
maralvira 6da84819dd use stdint.h instead of custom types.h
stdint.h is more portable across compilers
2010-11-10 22:06:28 +00:00
maralvira 77cf0f0f5e update ring_osc_on and _off to the new bit structs 2010-11-07 14:42:31 +00:00
maralvira dab7faf13c Add gpio_set and gpio_reset
Use them like gpio_set(GPIO_xx) and gpio_reset(GPIO_xx).
These macros efficiently set the DATA_SET and DATA_RESET bits without
reading the registers first, as a direct GPIO->DATA_SET.GPIO_xx would do
2010-11-07 14:29:04 +00:00
maralvira 4a4a39c84a Name the GPIO structure so we can set multiple bits at once 2010-11-07 14:28:30 +00:00
maralvira 65d3942c76 Add the disable_int({}) macro
This is similar to safe_irq_enable and disable
2010-11-07 14:26:24 +00:00
maralvira 83e6995af1 Add TMR_ADDR helper 2010-11-07 14:25:07 +00:00
maralvira d930ce0e2b Add some useful timer macros 2010-11-07 14:24:36 +00:00
maralvira 5e00219a9c Register definitions: get rid of some macro magic that doesn't help much
Instead of e.g. GPIO.DATA.GPIO_08, you now use GPIO->DATA.GPIO_08.
2010-11-07 14:24:11 +00:00
maralvira 091e4cd84e Add structure-based ITC access 2010-11-07 14:23:15 +00:00
maralvira 11ac20a361 REF_OSC is a 32-bit number, not 64-bit number 2010-11-07 14:22:51 +00:00
maralvira 745e7b5ac2 Add cal_isr() support 2010-11-07 14:21:59 +00:00
maralvira ab84453401 Add structure-based CRM definitions 2010-11-07 14:21:33 +00:00
maralvira 9d072d5309 Add macro to help compute TMR.ENBL values (useful when using #defined
values to represent timers)
2010-11-07 14:21:06 +00:00
maralvira 85e6b06175 Add pin definitions for each timer, they're fixed 2010-11-07 14:19:17 +00:00
maralvira 3726588f02 Add structure-based GPIO register definitions 2010-11-07 14:17:45 +00:00
maralvira 20b477db13 Add structure-based timer register definitions 2010-11-07 14:17:20 +00:00
maralvira c71a0243ff Add missing type for TMR0_COMP2 2010-11-07 14:16:28 +00:00
maralvira f1fede7090 get LQI of received packets 2010-11-07 14:06:57 +00:00
maralvira ae0b7f846f Fix the CNTR defines.
Thanks to Ruslan for finding this.
2010-11-07 14:04:59 +00:00
maralvira 419906a769 initial mc1322x commit
based on commit aac3a355451d899f02737f2907af8c874ee4feba of

git://git.devl.org/git/malvira/contiki-mc1322x.git
2010-06-10 14:55:39 +00:00