Diff: oslmic.h

Revision:

1:d3b7bde3995c

Parent:

0:62d1edcc13d1

Child:

6:59bd35cd865a

--- a/oslmic.h	Thu Jan 22 12:50:49 2015 +0000
+++ b/oslmic.h	Tue Mar 31 13:36:56 2015 +0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 IBM Corporation.
+ * Copyright (c) 2014-2015 IBM Corporation.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *    IBM Zurich Research Lab - initial API, implementation and documentation
  *******************************************************************************/
 
+//! \file
 #ifndef _oslmic_h_
 #define _oslmic_h_
 
@@ -33,12 +34,11 @@
 typedef unsigned int       uint;
 typedef const char* str_t;
 
-#define CFG_noassert 1
 #include <string.h>
 #include "hal.h"
 #define EV(a,b,c) /**/
-#define DO_DEVDB(meth,...) /**/
-#if !CFG_noassert
+#define DO_DEVDB(field1,field2) /**/
+#if !defined(CFG_noassert)
 #define ASSERT(cond) if(!(cond)) hal_failed()
 #else
 #define ASSERT(cond) /**/
@@ -49,14 +49,12 @@
 
 typedef     struct osjob_t osjob_t;
 typedef      struct band_t band_t;
-typedef      struct rxqu_t rxqu_t;
 typedef   struct chnldef_t chnldef_t;
 typedef   struct rxsched_t rxsched_t;
 typedef   struct bcninfo_t bcninfo_t;
 typedef        const u1_t* xref2cu1_t;
 typedef              u1_t* xref2u1_t;
 #define TYPEDEF_xref2rps_t     typedef         rps_t* xref2rps_t
-#define TYPEDEF_xref2rxqu_t    typedef        rxqu_t* xref2rxqu_t
 #define TYPEDEF_xref2rxsched_t typedef     rxsched_t* xref2rxsched_t
 #define TYPEDEF_xref2chnldef_t typedef     chnldef_t* xref2chnldef_t
 #define TYPEDEF_xref2band_t    typedef        band_t* xref2band_t
@@ -79,7 +77,7 @@
 #define DEFINE_LMIC  struct lmic_t LMIC
 #define DECLARE_LMIC extern struct lmic_t LMIC
 
-void radio_init(void);
+void radio_init (void);
 void radio_irq_handler (u1_t dio);
 void os_init (void);
 void os_runloop (void);
@@ -126,7 +124,7 @@
 TYPEDEF_xref2osjob_t;
 
 
-#if !HAS_os_calls
+#ifndef HAS_os_calls
 
 #ifndef os_getDevKey
 void os_getDevKey (xref2u1_t buf);