Convert code to use the mynewt.h header.

Author: ccollins476ad

apps/blecent/src/blecent.h

@@ -20,7 +20,7 @@
 #ifndef H_BLECENT_
 #define H_BLECENT_
 
-#include "os/queue.h"
+#include "os/mynewt.h"
 #include "log/log.h"
 #ifdef __cplusplus
 extern "C" {

apps/blecent/src/main.c

@@ -19,10 +19,8 @@
 
 #include <assert.h>
 #include <string.h>
-#include "syscfg/syscfg.h"
-#include "sysinit/sysinit.h"
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
-#include "os/os.h"
 
 /* BLE */
 #include "nimble/ble.h"

apps/blecsc/src/gatt_svr.c

@@ -20,10 +20,10 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
+#include "os/mynewt.h"
 #include "host/ble_hs.h"
 #include "host/ble_uuid.h"
 #include "blecsc_sens.h"
-#include "os/endian.h"
 
 #define CSC_ERR_CCC_DESC_IMPROPERLY_CONFIGURED  0x81
 

apps/blecsc/src/main.c

@@ -22,8 +22,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "sysinit/sysinit.h"
-#include "os/os.h"
+#include "os/mynewt.h"
 #include "console/console.h"
 #include "config/config.h"
 #include "nimble/ble.h"

apps/blehci/src/main.c

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 #include <assert.h>
-#include "sysinit/sysinit.h"
-#include "os/os.h"
+#include "os/mynewt.h"
 
 int
 main(void)

apps/blehr/src/main.c

@@ -22,8 +22,7 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "sysinit/sysinit.h"
-#include "os/os.h"
+#include "os/mynewt.h"
 #include "console/console.h"
 #include "config/config.h"
 #include "nimble/ble.h"

apps/blemesh/src/main.c

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 #include <assert.h>
-#include "sysinit/sysinit.h"
-#include "os/os.h"
+#include "os/mynewt.h"
 #include "mesh/mesh.h"
 #include "console/console.h"
 #include "hal/hal_system.h"

apps/blemesh_shell/src/main.c

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 #include <assert.h>
-#include "sysinit/sysinit.h"
-#include "os/os.h"
+#include "os/mynewt.h"
 #include "mesh/mesh.h"
 #include "console/console.h"
 #include "hal/hal_system.h"

apps/bleprph/src/main.c

@@ -21,9 +21,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include "sysinit/sysinit.h"
-#include "bsp/bsp.h"
-#include "os/os.h"
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
 #include "hal/hal_gpio.h"
 #include "console/console.h"

apps/bleprph/src/phy.c

@@ -17,11 +17,10 @@
  * under the License.
  */
 
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
 #include "hal/hal_gpio.h"
 #include "host/ble_gap.h"
-#include "os/os_eventq.h"
-#include "syscfg/syscfg.h"
 #include "bleprph.h"
 
 #if MYNEWT_VAL(BLEPRPH_LE_PHY_SUPPORT)

apps/bleprph_oic/src/main.c

@@ -21,9 +21,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <sysinit/sysinit.h>
-#include <bsp/bsp.h>
-#include <os/os.h>
+#include "os/mynewt.h"
 #include <bsp/bsp.h>
 #include <hal/hal_gpio.h>
 #include <console/console.h>

apps/blesplit/src/main.c

@@ -21,9 +21,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include "sysinit/sysinit.h"
-#include "bsp/bsp.h"
-#include "os/os.h"
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
 #include "hal/hal_gpio.h"
 #include "console/console.h"

apps/bletest/src/bletest_hci.c

@@ -19,9 +19,8 @@
 
 #include <assert.h>
 #include <string.h>
-#include "os/os.h"
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
-#include "syscfg/syscfg.h"
 
 /* BLE */
 #include "nimble/ble.h"

apps/bletest/src/main.c

@@ -19,9 +19,7 @@
 
 #include <assert.h>
 #include <string.h>
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
-#include "os/os.h"
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
 #include "hal/hal_bsp.h"
 #include "hal/hal_gpio.h"

apps/bletiny/src/bletiny.h

@@ -21,10 +21,10 @@
 #define H_BLETINY_PRIV_
 
 #include <inttypes.h>
+#include "os/mynewt.h"
 #include "nimble/ble.h"
 #include "nimble/nimble_opt.h"
 #include "log/log.h"
-#include "os/queue.h"
 
 #include "host/ble_gatt.h"
 #include "host/ble_gap.h"

apps/bletiny/src/main.c

@@ -21,13 +21,10 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include "syscfg/syscfg.h"
-#include "sysinit/sysinit.h"
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
 #include "log/log.h"
 #include "stats/stats.h"
-#include "os/os.h"
-#include "bsp/bsp.h"
 #include "hal/hal_gpio.h"
 #include "console/console.h"
 #include "shell/shell.h"

apps/bleuart/src/main.c

@@ -21,9 +21,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include "sysinit/sysinit.h"
-#include "bsp/bsp.h"
-#include "os/os.h"
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
 #include "hal/hal_gpio.h"
 #include <imgmgr/imgmgr.h>

apps/boot/src/boot.c

@@ -20,16 +20,12 @@
 #include <assert.h>
 #include <stddef.h>
 #include <inttypes.h>
-#include "syscfg/syscfg.h"
+#include "os/mynewt.h"
 #include <flash_map/flash_map.h>
-#include <os/os.h>
 
 #include <hal/hal_bsp.h>
 #include <hal/hal_system.h>
 #include <hal/hal_flash.h>
-#if MYNEWT_VAL(BOOT_SERIAL)
-#include <sysinit/sysinit.h>
-#endif
 #include <console/console.h>
 #include "bootutil/image.h"
 #include "bootutil/bootutil.h"

apps/bsncent/src/bsncent.h

@@ -20,7 +20,7 @@
 #ifndef H_BSNCENT_
 #define H_BSNCENT_
 
-#include "os/queue.h"
+#include "os/mynewt.h"
 #include "log/log.h"
 #ifdef __cplusplus
 extern "C" {

apps/bsncent/src/main.c

@@ -19,10 +19,8 @@
 
 #include <assert.h>
 #include <string.h>
-#include "syscfg/syscfg.h"
-#include "sysinit/sysinit.h"
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
-#include "os/os.h"
 
 /* BLE */
 #include "nimble/ble.h"

apps/bsnprph/src/main.c

@@ -21,9 +21,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include "sysinit/sysinit.h"
-#include "bsp/bsp.h"
-#include "os/os.h"
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
 #include "hal/hal_gpio.h"
 #include "console/console.h"

apps/btshell/src/btshell.h

@@ -21,10 +21,10 @@
 #define H_BTSHELL_PRIV_
 
 #include <inttypes.h>
+#include "os/mynewt.h"
 #include "nimble/ble.h"
 #include "nimble/nimble_opt.h"
 #include "log/log.h"
-#include "os/queue.h"
 
 #include "host/ble_gatt.h"
 #include "host/ble_gap.h"

apps/btshell/src/cmd.c

@@ -17,12 +17,11 @@
  * under the License.
  */
 
-#include "syscfg/syscfg.h"
-
 #include <assert.h>
 #include <inttypes.h>
 #include <errno.h>
 #include <string.h>
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
 
 #include "nimble/ble.h"

apps/btshell/src/main.c

@@ -21,12 +21,10 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include "syscfg/syscfg.h"
-#include "sysinit/sysinit.h"
+#include "os/mynewt.h"
 #include "bsp/bsp.h"
 #include "log/log.h"
 #include "stats/stats.h"
-#include "os/os.h"
 #include "bsp/bsp.h"
 #include "hal/hal_gpio.h"
 #include "console/console.h"

apps/ffs2native/src/main.c

@@ -24,18 +24,14 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <string.h>
+#include "os/mynewt.h"
 #include "../src/nffs_priv.h"
-#include <os/queue.h>
 #include <fs/fs.h>
 #include <bsp/bsp.h>
 #include <nffs/nffs.h>
 #include <hal/hal_flash.h>
 #include <flash_map/flash_map.h>
 
-#include <sysinit/sysinit.h>
-#include <syscfg/syscfg.h>
-#include <sysflash/sysflash.h>
-
 #ifdef ARCH_sim
 #include <mcu/mcu_sim.h>
 #endif

apps/iptest/src/main.c

@@ -17,11 +17,7 @@
  * under the License.
  */
 
-#include "syscfg/syscfg.h"
-#include "sysinit/sysinit.h"
-#include "sysflash/sysflash.h"
-
-#include <os/os.h>
+#include "os/mynewt.h"
 #include <bsp/bsp.h>
 
 #include <hal/hal_gpio.h>
@@ -41,7 +37,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <os/os_time.h>
 #include <id/id.h>
 
 #if MYNEWT_VAL(BUILD_WITH_OIC)

apps/lora_app_shell/src/las_cmd.c

@@ -20,8 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
+#include "os/mynewt.h"
 #include "console/console.h"
 #include "shell/shell.h"
 #include "parse/parse.h"

apps/lora_app_shell/src/main.c

@@ -20,12 +20,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
+#include "os/mynewt.h"
 #include "hal/hal_gpio.h"
 #include "hal/hal_spi.h"
 #include "bsp/bsp.h"
-#include "os/os.h"
 #include "console/console.h"
 #include "shell/shell.h"
 #include "parse/parse.h"

apps/loraping/src/main.c

@@ -28,12 +28,10 @@ Description: Ping-Pong implementation.  Adapted to run in the MyNewt OS.
 */
 
 #include <string.h>
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
+#include "os/mynewt.h"
 #include "hal/hal_gpio.h"
 #include "hal/hal_spi.h"
 #include "bsp/bsp.h"
-#include "os/os.h"
 #include "radio/radio.h"
 #include "loraping.h"
 

apps/lorashell/src/main.c

@@ -59,12 +59,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
+#include "os/mynewt.h"
 #include "hal/hal_gpio.h"
 #include "hal/hal_spi.h"
 #include "bsp/bsp.h"
-#include "os/os.h"
 #include "node/radio.h"
 #include "console/console.h"
 #include "shell/shell.h"

apps/ocf_sample/src/main.c

@@ -17,9 +17,7 @@
  * under the License.
  */
 #include <assert.h>
-#include "sysinit/sysinit.h"
-#include <os/os.h>
-#include <sysinit/sysinit.h>
+#include "os/mynewt.h"
 #include <bsp/bsp.h>
 #include <log/log.h>
 #include <oic/oc_api.h>

apps/ocf_sample/src/ocf_ble.c

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "syscfg/syscfg.h"
+#include "os/mynewt.h"
 
 #if MYNEWT_VAL(OC_TRANSPORT_GATT)