deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added a macro for portable watchdog calls.

Browse source
This commit is contained in:
nvt-se 2010-12-15 14:01:07 +00:00
parent 79ae813f88
commit 404230a047
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/cfs/cfs-coffee.c
View file

@ -53,12 +53,17 @@
#include "cfs-coffee-arch.h" #include "cfs-coffee-arch.h"
#include "cfs/cfs-coffee.h" #include "cfs/cfs-coffee.h"
/* Platforms that have watchdog timers enable should
define these macros in cfs-coffee-arch.h. */
#ifndef COFFEE_WATCHDOG_START #ifndef COFFEE_WATCHDOG_START
#define COFFEE_WATCHDOG_START() #define COFFEE_WATCHDOG_START()
#endif #endif
#ifndef COFFEE_WATCHDOG_STOP #ifndef COFFEE_WATCHDOG_STOP
#define COFFEE_WATCHDOG_STOP() #define COFFEE_WATCHDOG_STOP()
#endif #endif
#ifndef COFFEE_WATCHDOG_PERIODIC
#define COFFEE_WATCHDOG_PERIODIC()
#endif
#ifndef COFFEE_CONF_APPEND_ONLY #ifndef COFFEE_CONF_APPEND_ONLY
#define COFFEE_APPEND_ONLY 0 #define COFFEE_APPEND_ONLY 0
@ -502,7 +507,7 @@ file_end(coffee_page_t start)
*/ */
for(page = hdr.max_pages - 1; page >= 0; page--) { for(page = hdr.max_pages - 1; page >= 0; page--) {
watchdog_periodic(); COFFEE_WATCHDOG_PERIODIC();
COFFEE_READ(buf, sizeof(buf), (start + page) * COFFEE_PAGE_SIZE); COFFEE_READ(buf, sizeof(buf), (start + page) * COFFEE_PAGE_SIZE);
for(i = COFFEE_PAGE_SIZE - 1; i >= 0; i--) { for(i = COFFEE_PAGE_SIZE - 1; i >= 0; i--) {
if(buf[i] != 0) { if(buf[i] != 0) {
@ -1083,13 +1088,13 @@ cfs_remove(const char *name)
int int
cfs_read(int fd, void *buf, unsigned size) cfs_read(int fd, void *buf, unsigned size)
{ {
struct file_header hdr;
struct file_desc *fdp; struct file_desc *fdp;
struct file *file; struct file *file;
#if COFFEE_MICRO_LOGS
struct file_header hdr;
struct log_param lp;
unsigned bytes_left; unsigned bytes_left;
int r; int r;
#if COFFEE_MICRO_LOGS
struct log_param lp;
#endif #endif
if(!(FD_VALID(fd) && FD_READABLE(fd))) { if(!(FD_VALID(fd) && FD_READABLE(fd))) {
@ -1117,7 +1122,7 @@ cfs_read(int fd, void *buf, unsigned size)
* ordinary file if the page has no log record. * ordinary file if the page has no log record.
*/ */
for(bytes_left = size; bytes_left > 0; bytes_left -= r) { for(bytes_left = size; bytes_left > 0; bytes_left -= r) {
watchdog_periodic(); COFFEE_WATCHDOG_PERIODIC();
r = -1; r = -1;
lp.offset = fdp->offset; lp.offset = fdp->offset;
@ -1241,7 +1246,7 @@ cfs_readdir(struct cfs_dir *dir, struct cfs_dirent *record)
memcpy(&page, dir->dummy_space, sizeof(coffee_page_t)); memcpy(&page, dir->dummy_space, sizeof(coffee_page_t));
while(page < COFFEE_PAGE_COUNT) { while(page < COFFEE_PAGE_COUNT) {
watchdog_periodic(); COFFEE_WATCHDOG_PERIODIC();
read_header(&hdr, page); read_header(&hdr, page);
if(HDR_ACTIVE(hdr) && !HDR_LOG(hdr)) { if(HDR_ACTIVE(hdr) && !HDR_LOG(hdr)) {
coffee_page_t next_page; coffee_page_t next_page;

4
platform/esb/cfs-coffee-arch.h
View file

@ -70,6 +70,10 @@
#define COFFEE_ERASE(sector) cfs_coffee_arch_erase(sector) #define COFFEE_ERASE(sector) cfs_coffee_arch_erase(sector)
#define COFFEE_WATCHDOG_START() watchdog_start()
#define COFFEE_WATCHDOG_STOP() watchdog_stop()
#define COFFEE_WATCHDOG_PERIODIC() watchdog_periodic()
void cfs_coffee_arch_erase(uint16_t sector); void cfs_coffee_arch_erase(uint16_t sector);
typedef int16_t coffee_page_t; typedef int16_t coffee_page_t;

1
platform/sky/cfs-coffee-arch.h
View file

@ -60,6 +60,7 @@
#define COFFEE_WATCHDOG_START() watchdog_start() #define COFFEE_WATCHDOG_START() watchdog_start()
#define COFFEE_WATCHDOG_STOP() watchdog_stop() #define COFFEE_WATCHDOG_STOP() watchdog_stop()
#define COFFEE_WATCHDOG_PERIODIC() watchdog_periodic()
/* Flash operations. */ /* Flash operations. */
#define COFFEE_WRITE(buf, size, offset) \ #define COFFEE_WRITE(buf, size, offset) \