Commit graph

505 commits

Author SHA1 Message Date
nvt-se 6983417307 forgot return. 2007-08-16 17:10:49 +00:00
nvt-se 8b3e9477d9 call dma_init. 2007-08-16 13:54:58 +00:00
nvt-se d5027f0041 Subscribe to DMA events on line 0 for the radio. 2007-08-16 13:52:17 +00:00
nvt-se 0723f1fbc7 Make it possible to subscribe to DMA events. 2007-08-16 13:51:57 +00:00
nifi 2780aef873 Include msp430def.h for standard defines 2007-08-16 13:35:33 +00:00
nvt-se fefe56d913 Changes to standard types. 2007-08-16 13:24:57 +00:00
bg- f398e56048 * Include avrdef.h for standard defines.
* Define AODV_COMPLIANCE.
2007-08-16 13:24:20 +00:00
nvt-se 5db2990884 Use the new type definitions file for msp430. 2007-08-16 13:23:41 +00:00
bg- a20c9e6abb * Include msp430def.h for standard defines.
* Remove obsolete LPM_CONF_OFF definition.
2007-08-16 13:10:53 +00:00
oliverschmidt c42cbe3141 Added a naive clock implementation based on main loop counting for the Apple2 as it doesn't have a hardware clock. 2007-08-10 13:30:02 +00:00
nifi 296ad6cdb7 Updated to new radio_driver API 2007-08-07 11:20:11 +00:00
nifi 7e57cd240a Updated to new radio_driver and mac_driver APIs 2007-08-07 11:17:54 +00:00
nifi cc80dbf546 removed obsolete rime code for tr1001 2007-08-07 11:16:19 +00:00
nifi d74d8d176d Updated to new radio_driver API, removed obsolete rime code 2007-08-07 11:14:39 +00:00
nifi fb54bba19e Updated to new radio_driver API + LPM4_EXIT instead of LPM_AWAKE() 2007-08-07 11:11:19 +00:00
nifi 39c12bad29 Added stdint.h 2007-08-07 11:09:38 +00:00
nifi 6b2cd5c2d4 LPM4_EXIT instead of LPM_AWAKE() 2007-08-07 11:06:14 +00:00
nvt-se 199e6bd270 Use stdint.h 2007-08-06 12:20:46 +00:00
nvt-se 016778b29e Removed redundant text. 2007-08-02 08:58:38 +00:00
nvt-se 6139885c51 Awake in order to let event processing occur immediately. 2007-08-02 08:57:58 +00:00
nvt-se a6af72d129 Style changes. 2007-08-02 08:17:43 +00:00
nvt-se 0412975efd Uncommented radio init line.
Added informative output.
2007-08-02 08:14:00 +00:00
nvt-se a6dba97b84 Erase only main flash memory. 2007-08-02 08:13:20 +00:00
nvt-se 709adf51ad Contributions from Michael Baar:
# msb430\dev\cc1020.c
Data type problem in the calibration function, therefore looping 10 seconds on boot. Fixed.

# msb430\contiki-msb430-main.c
Directly accessed power management while other modules used the Contiki layer resulting in the node sleeping most of the time. Fixed.
Added uIP support.

# msb430\buildscripts\makefile.win
Changed to erase only main-memory but keep infomemory so the node configuration is not erashed during flashing.
2007-07-31 07:54:44 +00:00
fros4943 1a021bbfc3 random ack time 2007-07-26 13:22:01 +00:00
fros4943 d80efeb8ed defining uip cache size 2007-07-20 15:21:56 +00:00
fros4943 3768b44804 updated uip uaodv radio driver 2007-07-17 23:02:21 +00:00
fros4943 55443a148a storing ack destination + removed header compression 2007-07-16 07:40:55 +00:00
fros4943 c50b7cc7ee unicast packets being acknowledged 2007-07-11 15:23:42 +00:00
nvt-se 836eae63cb Improvement batch. 2007-07-05 08:35:13 +00:00
nvt-se eb7f7ba65b Some more cleaning up. 2007-06-28 18:27:45 +00:00
nvt-se 268766e890 dma transfer support. 2007-06-28 14:41:17 +00:00
nvt-se ff04b5e153 cleaned file. 2007-06-28 14:07:02 +00:00
nvt-se b88e6642bd Removed unnecessary things. 2007-06-28 13:47:28 +00:00
nvt-se d7c489f0b2 jtag support. 2007-06-28 13:43:24 +00:00
nvt-se ff3e2b8bd8 From the ESB port. 2007-06-28 12:54:05 +00:00
nvt-se ae2e9f3677 Platform-specific devices. 2007-06-28 12:52:41 +00:00
nvt-se 792056e325 Test applications. 2007-06-28 12:51:31 +00:00
nvt-se 365f99e5c8 Scatterweb MSB430 port. 2007-06-28 12:49:57 +00:00
fros4943 78a06fe9b5 using nullmac for cooja rime radio 2007-06-08 12:25:54 +00:00
bg- 0e515a5472 * Initialise rand package. 2007-06-04 18:09:14 +00:00
nifi c4421c1d4b added Makefile option for choosing between rime and uip 2007-06-01 12:46:07 +00:00
bg- 2e7c6b59fb * The sources for crtk.o and service.o have been retired. 2007-05-31 14:26:58 +00:00
oliverschmidt bc46e8a49e Removed clock stuff from main file. 2007-05-29 22:02:37 +00:00
fros4943 7ec1a4f7aa added check that outgoing packet was not discarded from simulator 2007-05-29 12:53:49 +00:00
fros4943 6aafd5582d removed old radio-arch.* (was earlier renamed to cooja-radio) 2007-05-29 12:27:00 +00:00
fros4943 d6d34b33a5 aodv setting 2007-05-29 09:13:37 +00:00
bg- ceb423c007 * Add sht11_off. 2007-05-28 16:24:58 +00:00
fros4943 da3b1ab813 make sure mote doesn't fall asleep while radio is transmitting/receiving 2007-05-28 15:47:07 +00:00
oliverschmidt 24f6cf175d Start out with minimal main(). 2007-05-27 21:11:08 +00:00
oliverschmidt f0e3996e07 For now delegate all work to the 6502 makefile. 2007-05-27 21:00:59 +00:00
oliverschmidt 99fdfbb6d8 Start out with default linker config. 2007-05-27 20:56:36 +00:00
oliverschmidt 3a1de93851 Start out with minimal Contiki config. 2007-05-27 20:54:13 +00:00
oliverschmidt 0cd5f4fa0a Reduced Contiki config to the minimum. 2007-05-27 20:52:42 +00:00
oliverschmidt 793d71f65d Originally left this file alone as I thought it might help on consolidating with cpu/native/net/tapdev.c but actually is doesn't contain unique content so it can be removed now as well. 2007-05-27 08:54:36 +00:00
oliverschmidt e7bc74a9d0 Changed packet drivers from services to plain processes.
Now tcpip_output() is a function pointer that is supposed to be set via the macro tcpip_set_outputfunc(). Packet drivers do so on process startup.

Thus if there are several packet drivers in a Contiki system the one started last is the one actually used. This behaviour is especially useful for the 'IP forwarding' "meta" packet driver.
2007-05-26 23:12:56 +00:00
oliverschmidt 75f04995a9 Changed packet drivers from services to plain processes.
Now tcpip_output() is a function pointer that is supposed to be set via the macro tcpip_set_outputfunc(). Packet drivers do so on process startup.

Thus if there are several packet drivers in a Contiki system the one started last is the one actually used. This behaviour is especially useful for the 'IP forwarding' "meta" packet driver.
2007-05-26 23:05:36 +00:00
oliverschmidt fa3819ed1c Moved ninimal-ppp into backyard as it depends on the uIP ppp support. 2007-05-26 07:20:07 +00:00
adamdunkels be2a7e954c Added initialization of MAC and Rime 2007-05-25 08:08:36 +00:00
adamdunkels ca356ea2e2 Added CC2420 driver 2007-05-25 08:08:21 +00:00
oliverschmidt e54fb521e2 The Visual C++ project file is the first to go without service.c . 2007-05-23 23:42:42 +00:00
oliverschmidt 934fa73d29 Moved all existing C64 stuff into new secondary directory tree. 2007-05-23 22:36:05 +00:00
oliverschmidt a300c31d7e Removed explicit shut down of network driver as it easily results in endless recursions on errors while network driver initialisation. 2007-05-23 22:01:14 +00:00
oliverschmidt 2e1ac205e2 Avoid compiler warnings. 2007-05-22 21:33:31 +00:00
oliverschmidt e867c6afcb Explicitly shut down network driver. 2007-05-22 21:27:55 +00:00
oliverschmidt a7dba4cc4f Explicitly shut down network driver. 2007-05-22 21:19:34 +00:00
adamdunkels dab63c4c6b Added energy estimation, leds instead of minileds to be able to do energy estimation on leds 2007-05-22 21:16:37 +00:00
adamdunkels 8811fe23fd Added sht11, energy estimation, xmac, diabled uIP (for now) 2007-05-22 21:13:26 +00:00
adamdunkels 1f835946ca Added X-MAC configuration, reduced ELF loader text memory size 2007-05-22 21:12:15 +00:00
adamdunkels 81dfaf575c Updated API 2007-05-22 21:09:19 +00:00
adamdunkels 6357c240c0 Added rtimer, ethernode rime initialization 2007-05-22 21:08:57 +00:00
adamdunkels a473b6ff33 Made TR1001 work with Rime 2007-05-22 21:08:24 +00:00
adamdunkels f33844bd9c Added energy estimation 2007-05-22 21:07:51 +00:00
adamdunkels b32a9b9be5 Returning the actual value rather than something read during an interrupt 2007-05-22 21:06:57 +00:00
adamdunkels de4ef02e49 Added energy estimation, size of queue buffers to two. 2007-05-22 21:06:30 +00:00
adamdunkels 42e84048f6 Added energy estimation, low power mode 2007-05-22 21:05:53 +00:00
adamdunkels 770632e079 Removed redundant file 2007-05-22 20:49:39 +00:00
fros4943 cbc6f57f34 removed old cfs.c 2007-05-21 14:57:47 +00:00
fros4943 166ff3a4a0 new includes 2007-05-21 14:52:15 +00:00
bg- d273319641 * Contiki names for integer types. 2007-05-21 14:51:32 +00:00
bg- e83221cdab * Compiler option -mno-tablejump should not be default. 2007-05-21 14:30:52 +00:00
bg- 95d95a63ac * s/uip-fw-service/uip-fw-drv/ 2007-05-21 14:22:05 +00:00
bg- a3f5123c44 * s/uip-fw-service/uip-fw-drv/ 2007-05-21 14:21:07 +00:00
bg- be3d5e8394 * s/uip-fw-service/uip-fw-drv/ 2007-05-21 14:13:04 +00:00
oliverschmidt a22d2ecfef Changed packet drivers from services to plain processes.
Now tcpip_output() is a function pointer that is supposed to be set via the macro tcpip_set_outputfunc(). Packet drivers do so on process startup.

Thus if there are several packet drivers in a Contiki system the one started last is the one actually used. This behaviour is especially useful for the 'IP forwarding' "meta" packet driver.
2007-05-20 21:41:31 +00:00
oliverschmidt 5f3296e943 Changed packet drivers from services to plain processes.
Now tcpip_output() is a function pointer that is supposed to be set via the macro tcpip_set_outputfunc(). Packet drivers do so on process startup.

Thus if there are several packet drivers in a Contiki system the one started last is the one actually used. This behaviour is especially useful for the 'IP forwarding' "meta" packet driver.
2007-05-20 21:29:39 +00:00
oliverschmidt 61f54204d7 Improved map file naming consistency. 2007-05-19 21:46:43 +00:00
oliverschmidt 0e023b328a Changed Contiki File System (cfs) from a service to a plain library.
This change means that one needs to select _ONE_ cfs implementation at Contiki library link time. But this doesn't appear to be an issue as all platforms have their "favorite" implementation anyway.
2007-05-19 21:37:54 +00:00
oliverschmidt d4528e427f Changed Contiki File System (cfs) from a service to a plain library.
This change means that one needs to select _ONE_ cfs implementation at Contiki library link time. But this doesn't appear to be an issue as all platforms have their "favorite" implementation anyway.
2007-05-19 21:16:08 +00:00
oliverschmidt 9f97290665 Changed Contiki File System (cfs) from a service to a plain library.
This change means that one needs to select _ONE_ cfs implementation at Contiki library link time. But this doesn't appear to be an issue as all platforms have their "favorite" implementation anyway.
2007-05-19 21:05:48 +00:00
fros4943 8d6cd6a5b5 dummy mtarch 2007-05-19 14:47:17 +00:00
fros4943 841cbd1b99 uIP over uAODV simple radio driver 2007-05-19 14:25:43 +00:00
oliverschmidt 1e372f13c6 Added new include directory to VC++ project files. 2007-05-19 13:38:25 +00:00
oliverschmidt eaff19200b Added new header file to VC++ project file. 2007-05-19 13:37:16 +00:00
oliverschmidt ae2073cac9 Factored out setup directory search path for source files into Makefile.include.
- All compilers used support the -I option for setting an include search directory.

- The Contiki source tree follows the (common) approach of placing declarations (in headerf iles) in the same directory as definitions (in source files).

As a result it makes sense to use the -I compiler option for just the same set of directories used for the vpath gnumake directive.

Note: I checked several builds but nevertheless one or the other might need some additional adjustsments. Sorry for the inconvenience.
2007-05-19 07:54:53 +00:00
fros4943 41adb8caf3 radio_sstrength returns last received packet instead of current value
radio_current_sstrength returns current value
2007-05-18 15:20:20 +00:00
fros4943 8ef1b90a10 removed radio sources from makefile
(thrown during compilation instead)
2007-05-18 13:51:04 +00:00
fros4943 2e11cfcdeb removed compiler warning 2007-05-18 13:50:08 +00:00
fros4943 afe66ed534 cooja radio driver (uip + rime) 2007-05-18 13:49:49 +00:00
fros4943 63c7300388 cooja's init-net for uip and rime 2007-05-18 13:49:15 +00:00
fros4943 643ce5adfe added support for several contiki comm stacks (uip + rime) 2007-05-18 13:45:19 +00:00
fros4943 5b3923141f added buffer overflow check 2007-05-15 18:13:32 +00:00
fros4943 2f29a448dd radio_sstrength returns the signal strength of last packet received (instead of uninteresting current value) 2007-05-15 14:39:52 +00:00
adamdunkels 71573a4968 Added sht11 driver, energy estimation. Removed IP/SLIP support for now 2007-05-15 08:11:59 +00:00
adamdunkels 459d91512a Added rtimer initialization 2007-05-15 08:11:33 +00:00
adamdunkels d9a4c02fab Platform-specific energy estimation code 2007-05-15 07:42:22 +00:00
oliverschmidt 237b1617b5 Factored out setup directory search path for source files into Makefile.include.
- Search target specific directories before CPU specific directories.
- Search CPU specific directories before generic directories.

Note: I checked several builds but nevertheless one or the other might need some additional adjustsments. Sorry for the inconvenience.
2007-05-13 08:41:11 +00:00
oliverschmidt 4fd1e3ece0 Added signed 32 bit data type. 2007-05-12 20:58:12 +00:00
nifi 4601d620b9 network setup for uip without slip 2007-05-09 15:13:01 +00:00
bg- 07d885ff2b * Add cle_avr.o 2007-04-26 13:40:26 +00:00
bg- 242f8085be * Add cle_msp430.o 2007-04-26 13:39:52 +00:00
bg- cf14e47a0f * Also include dynamic loader (tcp_loader.o). 2007-04-26 12:55:46 +00:00
bg- 8754cbd4cd * Use mknmlist-ansi and sym.o. 2007-04-25 15:49:43 +00:00
fros4943 da3d423233 support for sending several packets fast 2007-04-23 08:46:35 +00:00
oliverschmidt 42d0fe9c18 Very minor beautification. 2007-04-21 22:17:22 +00:00
oliverschmidt 3b7c27b9e9 Use generally lowercase names for functin variables. 2007-04-21 15:11:21 +00:00
oliverschmidt dba1672323 Make use of __inline (just as making use of __fastcall) in order to check that CC_CONF_INLINE (just as CC_CONF_FASTCALL) are used in a syntactically correct manner. 2007-04-18 21:36:44 +00:00
oliverschmidt 33eeb8ccbb - Switched from from a CTK draw service to a statically linked CTK draw implementation.
- Workarounded the following CTK glitch:

ctk.c calls ctk_arch_keyavail() and ctk_arch_getkey() and needs therefore appropriate declarations (or macros) but it doesn't include a ctk_arch.h or alike to bring those in. So it's necessary to bring those declarations in via contiki-conf.h.

But ctk_arch_getkey() is supposed to return a ctk_arch_key_t - and this typedef'ed in ctk.h which means that ctk.h would need to be included in contiki-conf.h before declaring ctk_arch_getkey().

This IS rather undesirable so the current workaround is to declare ctk_arch_getkey() as returning a char - this is btw done similiar in platform/gtk as well. See ctk/ctk-gtksim.h:

guint ctk_arch_getkey(void);
2007-04-15 13:30:16 +00:00
oliverschmidt f16d041476 Provided a meaningful clock_time() implementation - which btw. makes the Cygwin variant finally work :-) 2007-04-14 23:23:15 +00:00
oliverschmidt 3a8fb3ad9f Initializing the console Just-In-Time on CTK startup and starting up the WinPcap before CTK allows WinPcap to print initialization errors (especially a missing command line arg) without clearing the shell output. 2007-04-14 14:57:19 +00:00
oliverschmidt c1b0a3f0d3 Cygin (in opposite to VC++) doesn't call exit() - and thus our atexit function - on Ctrl-C. Therefore we install an explict ConsoleCtrlHandler which calls exit(). For the sake of simplicity it's not #ifdef'ed _CYGWIN_. 2007-04-14 14:28:19 +00:00
oliverschmidt 8f0753c402 Link in and start the POSIX file system to make the telnet-server example 'ls' command generally work. Typically it will complain about not finding 'cfs-root/.' 2007-04-13 23:08:52 +00:00
oliverschmidt 766878f5c9 Added the shell server to the Win32 platform. 2007-04-13 21:55:55 +00:00
oliverschmidt 59c2158274 Removed minor redundancy. 2007-04-13 21:47:09 +00:00
oliverschmidt 7aae71934d Providing a dummy program_handler_load() made made the telnet server work without program-handler but on the other hand incompatible with an exsistng program handler :-(
Therefore I replaced that hack with a clean CONF macro, which by the way really removes the run() and exec() functionality instead of just implementing it empty.
2007-04-13 21:04:52 +00:00
bg- 87971c35db * Bump maximum number of udp sockets to 16 and fwcache size.
* Remove unused stuff.
2007-04-11 15:24:39 +00:00
bg- b32db9763e * Bump maximum number of udp sockets to 16.
* Remove unused stuff.
2007-04-11 15:22:05 +00:00
fros4943 f2f5ea682b added empty rtimer files to remove compilation errors
OBS: not implemented yet; rtimer does not work with COOJA
2007-04-11 12:46:13 +00:00
bg- 738a970660 * Also print channel number. 2007-04-11 10:13:59 +00:00
oliverschmidt 36f6efd21c Build the web server with CTK support. 2007-04-11 01:08:46 +00:00
oliverschmidt 743ec10b21 Added copyright notice. 2007-04-11 01:07:47 +00:00
oliverschmidt 902e2226b6 Use the cpu/native/net WinPcap driver for platform/win32 as well. 2007-04-11 00:33:08 +00:00
oliverschmidt 0b140bdec4 Integrated WinPcap driver into platform/win32 Cygwin build. 2007-04-11 00:32:31 +00:00
oliverschmidt 4bf1ecc20e Made endianess configuration actually work. 2007-04-11 00:25:38 +00:00
oliverschmidt ee6180dec6 Use the cpu/native/net WinPcap driver for platform/win32 as well. 2007-04-11 00:17:25 +00:00
oliverschmidt 2edc0246a3 Removed unnecessary directory reference. 2007-04-10 21:02:59 +00:00
oliverschmidt 38c3950d66 Link WinPcap packet driver statically into the main binary in preparation of removing the services. 2007-04-09 11:57:15 +00:00
oliverschmidt 9cc1871810 Fixed stupid bug. I have no idea how I didn't run into this one for months ! The development platforms have 400-600 bytes buffer size. So every incoming 1500 packet overwrote ~ 1000 bytes of uIP variables. And this happens very easily as every packet coming in for the Windows IP stack is seen by uIP as well (and discarded because of the wrong IP address). 2007-04-08 20:06:56 +00:00
oliverschmidt d0e75920f1 Moved VC++ project files into vcproj subdirectory. 2007-04-06 23:53:59 +00:00
oliverschmidt 5653794966 Allow to build platform/win32 using Cygwin and the Contiki build system. The WinPcap driver is missing as it is about to be changed from dynamic to static loading anyway. 2007-04-06 23:09:32 +00:00
oliverschmidt 5532354cd8 Now that Contiki has a htonl() we need the same workaround here that we already have for htons(). 2007-04-06 22:36:31 +00:00
nifi 0b4a7e1c3d network setup for uip with slip 2007-04-05 08:11:57 +00:00
bg- 8f822c42b1 * Device driver for the SHT1x on the Tmote sky. 2007-04-04 12:48:50 +00:00
bg- 9205ceda12 * rm uip_log.
* more forced inclusions.
2007-04-04 11:41:38 +00:00
bg- 48c5cae451 * More routing and forwarding cache entries. 2007-04-04 11:39:49 +00:00
bg- 0d4799a415 * rm uip_log. 2007-04-04 11:38:35 +00:00
fros4943 6910c4d311 starting the tr1001 rime process at init 2007-04-04 09:12:14 +00:00
adamdunkels 04a5405540 Added initialization of rtimers 2007-04-03 19:04:50 +00:00
adamdunkels c24044e80c Made text appear lower to the right, made window larger to accommodate all nodes 2007-04-02 17:58:43 +00:00
fros4943 66e6ce1656 minor changes 2007-04-02 16:31:28 +00:00