You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2017/04/13 18:11:20 UTC
[6/7] incubator-mynewt-core git commit: Removed include path,
included specific parts of the Microchip SDK, fixed some errant capitalisation
Removed include path, included specific parts of the Microchip SDK, fixed some errant capitalisation
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/2e8de777
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/2e8de777
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/2e8de777
Branch: refs/heads/master
Commit: 2e8de77739024d616c7846a2d224c1d876ce912d
Parents: 039dd45
Author: julian <ju...@imgtec.com>
Authored: Thu Apr 13 16:45:05 2017 +0100
Committer: julian <ju...@imgtec.com>
Committed: Thu Apr 13 16:45:05 2017 +0100
----------------------------------------------------------------------
compiler/xc32/compiler.yml | 2 +-
hw/bsp/pic32mx470_6LP_clicker/bsp.yml | 53 -
hw/bsp/pic32mx470_6LP_clicker/include/bsp/bsp.h | 52 -
.../include/bsp/bsp_sysid.h | 36 -
hw/bsp/pic32mx470_6LP_clicker/pkg.yml | 46 -
hw/bsp/pic32mx470_6LP_clicker/src/hal_bsp.c | 27 -
hw/bsp/pic32mx470_6LP_clicker/src/os_bsp.c | 85 -
hw/bsp/pic32mx470_6LP_clicker/src/sbrk.c | 51 -
hw/bsp/pic32mx470_6LP_clicker/syscfg.yml | 41 -
hw/bsp/pic32mx470_6lp_clicker/bsp.yml | 53 +
hw/bsp/pic32mx470_6lp_clicker/include/bsp/bsp.h | 52 +
.../include/bsp/bsp_sysid.h | 36 +
hw/bsp/pic32mx470_6lp_clicker/pkg.yml | 46 +
hw/bsp/pic32mx470_6lp_clicker/src/hal_bsp.c | 27 +
hw/bsp/pic32mx470_6lp_clicker/src/os_bsp.c | 85 +
hw/bsp/pic32mx470_6lp_clicker/src/sbrk.c | 51 +
hw/bsp/pic32mx470_6lp_clicker/syscfg.yml | 41 +
.../pic32mx470F512H/include/mcu/mips_bsp.h | 24 -
.../pic32mx470F512H/include/mcu/mips_hal.h | 39 -
.../pic32mx470F512H/include/mcu/pic32.h | 25 -
hw/mcu/microchip/pic32mx470F512H/pkg.yml | 31 -
.../microchip/pic32mx470F512H/src/hal_os_tick.c | 36 -
.../microchip/pic32mx470F512H/src/hal_system.c | 35 -
hw/mcu/microchip/pic32mx470F512H/src/hal_uart.c | 463 -
.../pic32mx470F512H/src/hal_watchdog.c | 39 -
.../microchip/pic32mx470f512h/include/mcu/mcu.h | 25 +
.../pic32mx470f512h/include/mcu/mips_bsp.h | 24 +
.../pic32mx470f512h/include/mcu/mips_hal.h | 39 +
.../pic32mx470f512h/include/mcu/p32mx470f512h.h | 17933 ++++++
.../pic32mx470f512h/include/mcu/pic32.h | 25 +
.../pic32mx470f512h/include/mcu/ppic32mx.h | 1280 +
hw/mcu/microchip/pic32mx470f512h/pkg.yml | 31 +
.../microchip/pic32mx470f512h/src/hal_os_tick.c | 36 +
.../microchip/pic32mx470f512h/src/hal_system.c | 35 +
hw/mcu/microchip/pic32mx470f512h/src/hal_uart.c | 463 +
.../pic32mx470f512h/src/hal_watchdog.c | 39 +
.../pic32mz2048efg100/include/mcu/mcu.h | 25 +
.../include/mcu/p32mz2048efg100.h | 51671 +++++++++++++++++
kernel/os/include/os/arch/pic32/os/cp0defs.h | 1215 +
.../os/include/os/arch/pic32/os/os_arch_defs.h | 60 +
kernel/os/src/arch/pic32/asm/ctx.S | 3 +-
41 files changed, 73295 insertions(+), 1085 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/compiler/xc32/compiler.yml
----------------------------------------------------------------------
diff --git a/compiler/xc32/compiler.yml b/compiler/xc32/compiler.yml
index 8bf1567..611497e 100644
--- a/compiler/xc32/compiler.yml
+++ b/compiler/xc32/compiler.yml
@@ -24,7 +24,7 @@ compiler.path.objdump: "xc32-objdump"
compiler.path.objsize: "xc32-size"
compiler.path.objcopy: "xc32-objcopy"
-compiler.flags.base: -I/opt/microchip/xc32/v1.42/pic32mx/include -std=gnu11
+compiler.flags.base: -std=gnu11
compiler.flags.default: [compiler.flags.base, -O2, -g3]
compiler.flags.optimized: [compiler.flags.base, -Os -g3]
compiler.flags.debug: [compiler.flags.base, -g3]
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6LP_clicker/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6LP_clicker/bsp.yml b/hw/bsp/pic32mx470_6LP_clicker/bsp.yml
deleted file mode 100644
index c1d3d4c..0000000
--- a/hw/bsp/pic32mx470_6LP_clicker/bsp.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-bsp.arch: pic32
-bsp.compiler: compiler/xc32
-
-bsp.flash_map:
- areas:
- # System areas.
- FLASH_AREA_BOOTLOADER:
- device: 0
- offset: 0x00000000
- size: 0kB
- FLASH_AREA_IMAGE_0:
- device: 0
- offset: 0x00000000
- size: 0kB
- FLASH_AREA_IMAGE_1:
- device: 0
- offset: 0x00000000
- size: 0kB
- FLASH_AREA_IMAGE_SCRATCH:
- device: 0
- offset: 0x00000000
- size: 0kB
-
- # User areas.
- FLASH_AREA_REBOOT_LOG:
- user_id: 0
- device: 0
- offset: 0x00000000
- size: 0kB
- FLASH_AREA_NFFS:
- user_id: 1
- device: 0
- offset: 0x00000000
- size: 0kB
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6LP_clicker/include/bsp/bsp.h
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6LP_clicker/include/bsp/bsp.h b/hw/bsp/pic32mx470_6LP_clicker/include/bsp/bsp.h
deleted file mode 100644
index b3c219e..0000000
--- a/hw/bsp/pic32mx470_6LP_clicker/include/bsp/bsp.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef H_BSP_H
-#define H_BSP_H
-
-#include <inttypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Define special stackos sections */
-#define sec_data_core __attribute__((section(".data.core")))
-#define sec_bss_core __attribute__((section(".bss.core")))
-#define sec_bss_nz_core __attribute__((section(".bss.core.nz")))
-
-/* More convenient section placement macros. */
-#define bssnz_t sec_bss_nz_core
-
-extern uint8_t _ram_start;
-extern uint8_t _ccram_start;
-
-#define RAM_SIZE (128 * 1024)
-#define CCRAM_SIZE (64 * 1024)
-
-/* UART */
-#define UART_CNT 4
-#define CONSOLE_UART "uart2"
-
-#define NFFS_AREA_MAX (8)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* H_BSP_H */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6LP_clicker/include/bsp/bsp_sysid.h
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6LP_clicker/include/bsp/bsp_sysid.h b/hw/bsp/pic32mx470_6LP_clicker/include/bsp/bsp_sysid.h
deleted file mode 100644
index 7b0a24b..0000000
--- a/hw/bsp/pic32mx470_6LP_clicker/include/bsp/bsp_sysid.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef BSP_SYSID_H
-#define BSP_SYSID_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* stub until this BSP gets new HAL */
-enum system_device_id
-{
- RESERVED,
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BSP_SYSID_H */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6LP_clicker/pkg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6LP_clicker/pkg.yml b/hw/bsp/pic32mx470_6LP_clicker/pkg.yml
deleted file mode 100644
index bf2a1ed..0000000
--- a/hw/bsp/pic32mx470_6LP_clicker/pkg.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-pkg.name: hw/bsp/pic32mx470_6LP_clicker
-pkg.type: bsp
-pkg.description: BSP definition for the 6LoWPAN Clicker board.
-pkg.author: "Apache Mynewt <de...@mynewt.incubator.apache.org>"
-pkg.homepage: "http://mynewt.apache.org/"
-pkg.keywords:
- - pic32
- - microchip
- - clicker
-
-pkg.lflags:
- - -Wl,--defsym=_min_heap_size=0x400
-
-pkg.deps:
- - hw/mcu/microchip/pic32mx470f512h
-
-pkg.deps.UART_0:
- - hw/drivers/uart/uart_hal
-
-pkg.deps.UART_1:
- - hw/drivers/uart/uart_hal
-
-pkg.deps.UART_2:
- - hw/drivers/uart/uart_hal
-
-pkg.deps.UART_3:
- - hw/drivers/uart/uart_hal
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6LP_clicker/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6LP_clicker/src/hal_bsp.c b/hw/bsp/pic32mx470_6LP_clicker/src/hal_bsp.c
deleted file mode 100644
index c1187c6..0000000
--- a/hw/bsp/pic32mx470_6LP_clicker/src/hal_bsp.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#include "hal/hal_bsp.h"
-#include "bsp/bsp.h"
-#include <assert.h>
-
-const struct hal_flash *
-bsp_flash_dev(uint8_t id)
-{
- return 0;
-}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6LP_clicker/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6LP_clicker/src/os_bsp.c b/hw/bsp/pic32mx470_6LP_clicker/src/os_bsp.c
deleted file mode 100644
index 8add7e2..0000000
--- a/hw/bsp/pic32mx470_6LP_clicker/src/os_bsp.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "hal/hal_bsp.h"
-#include "syscfg/syscfg.h"
-#include "uart/uart.h"
-#if MYNEWT_VAL(UART_0) || MYNEWT_VAL(UART_1)
-#include "uart_hal/uart_hal.h"
-#endif
-
-#include <xc.h>
-
-#include <assert.h>
-
-#pragma config CP=1, FWDTEN=0, FCKSM=1, FPBDIV=1, OSCIOFNC=1, POSCMOD=1
-/* PLL conf div in: 2, mul: 20, div out: 1 8->4->80->80 */
-#pragma config FNOSC=3, FPLLODIV=0, UPLLEN=1, FPLLMUL=5, FPLLIDIV=1, FSRSSEL=7
-/* PGEC2/PGED2 pair is used */
-#pragma config ICESEL=2
-
-#if MYNEWT_VAL(UART_0)
-static struct uart_dev os_bsp_uart0;
-#endif
-
-#if MYNEWT_VAL(UART_1)
-static struct uart_dev os_bsp_uart1;
-#endif
-
-#if MYNEWT_VAL(UART_2)
-static struct uart_dev os_bsp_uart2;
-#endif
-
-#if MYNEWT_VAL(UART_3)
-static struct uart_dev os_bsp_uart3;
-#endif
-
-void _close(int fd);
-
-void
-hal_bsp_init(void)
-{
- int rc;
-
-#if MYNEWT_VAL(UART_0)
- rc = os_dev_create((struct os_dev *) &os_bsp_uart0, "uart0",
- OS_DEV_INIT_PRIMARY, 0, uart_hal_init, 0);
- assert(rc == 0);
-#endif
-
-#if MYNEWT_VAL(UART_1)
- rc = os_dev_create((struct os_dev *) &os_bsp_uart1, "uart1",
- OS_DEV_INIT_PRIMARY, 0, uart_hal_init, 0);
- assert(rc == 0);
-#endif
-
-#if MYNEWT_VAL(UART_2)
- rc = os_dev_create((struct os_dev *) &os_bsp_uart2, "uart2",
- OS_DEV_INIT_PRIMARY, 0, uart_hal_init, 0);
- assert(rc == 0);
-#endif
-
-#if MYNEWT_VAL(UART_3)
- rc = os_dev_create((struct os_dev *) &os_bsp_uart3, "uart3",
- OS_DEV_INIT_PRIMARY, 0, uart_hal_init, 0);
- assert(rc == 0);
-#endif
-
- (void)rc;
-}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6LP_clicker/src/sbrk.c
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6LP_clicker/src/sbrk.c b/hw/bsp/pic32mx470_6LP_clicker/src/sbrk.c
deleted file mode 100644
index d3f99d6..0000000
--- a/hw/bsp/pic32mx470_6LP_clicker/src/sbrk.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define HEAPSIZE (1024)
-
-static char __Heap[HEAPSIZE];
-
-void *
-_sbrk(int incr)
-{
- static char *brk = __Heap;
-
- void *prev_brk;
-
- if (incr < 0) {
- /* Returning memory to the heap. */
- incr = -incr;
- if (brk - incr < __Heap) {
- prev_brk = (void *)-1;
- } else {
- prev_brk = brk;
- brk -= incr;
- }
- } else {
- /* Allocating memory from the heap. */
- if ((__Heap + HEAPSIZE) - brk >= incr) {
- prev_brk = brk;
- brk += incr;
- } else {
- prev_brk = (void *)-1;
- }
- }
-
- return prev_brk;
-}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6LP_clicker/syscfg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6LP_clicker/syscfg.yml b/hw/bsp/pic32mx470_6LP_clicker/syscfg.yml
deleted file mode 100644
index 87c4e47..0000000
--- a/hw/bsp/pic32mx470_6LP_clicker/syscfg.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Package: hw/bsp/pic32mx470_6LP_clicker
-
-syscfg.defs:
- CLOCK_FREQ:
- description: 'TBD'
- value: 80000000ul
-
- UART_0:
- description: 'TBD'
- value: 1
-
- UART_1:
- description: 'TBD'
- value: 1
-
- UART_2:
- description: 'TBD'
- value: 1
-
- UART_3:
- description: 'TBD'
- value: 1
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6lp_clicker/bsp.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6lp_clicker/bsp.yml b/hw/bsp/pic32mx470_6lp_clicker/bsp.yml
new file mode 100644
index 0000000..c1d3d4c
--- /dev/null
+++ b/hw/bsp/pic32mx470_6lp_clicker/bsp.yml
@@ -0,0 +1,53 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+bsp.arch: pic32
+bsp.compiler: compiler/xc32
+
+bsp.flash_map:
+ areas:
+ # System areas.
+ FLASH_AREA_BOOTLOADER:
+ device: 0
+ offset: 0x00000000
+ size: 0kB
+ FLASH_AREA_IMAGE_0:
+ device: 0
+ offset: 0x00000000
+ size: 0kB
+ FLASH_AREA_IMAGE_1:
+ device: 0
+ offset: 0x00000000
+ size: 0kB
+ FLASH_AREA_IMAGE_SCRATCH:
+ device: 0
+ offset: 0x00000000
+ size: 0kB
+
+ # User areas.
+ FLASH_AREA_REBOOT_LOG:
+ user_id: 0
+ device: 0
+ offset: 0x00000000
+ size: 0kB
+ FLASH_AREA_NFFS:
+ user_id: 1
+ device: 0
+ offset: 0x00000000
+ size: 0kB
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6lp_clicker/include/bsp/bsp.h
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6lp_clicker/include/bsp/bsp.h b/hw/bsp/pic32mx470_6lp_clicker/include/bsp/bsp.h
new file mode 100644
index 0000000..b3c219e
--- /dev/null
+++ b/hw/bsp/pic32mx470_6lp_clicker/include/bsp/bsp.h
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef H_BSP_H
+#define H_BSP_H
+
+#include <inttypes.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Define special stackos sections */
+#define sec_data_core __attribute__((section(".data.core")))
+#define sec_bss_core __attribute__((section(".bss.core")))
+#define sec_bss_nz_core __attribute__((section(".bss.core.nz")))
+
+/* More convenient section placement macros. */
+#define bssnz_t sec_bss_nz_core
+
+extern uint8_t _ram_start;
+extern uint8_t _ccram_start;
+
+#define RAM_SIZE (128 * 1024)
+#define CCRAM_SIZE (64 * 1024)
+
+/* UART */
+#define UART_CNT 4
+#define CONSOLE_UART "uart2"
+
+#define NFFS_AREA_MAX (8)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BSP_H */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6lp_clicker/include/bsp/bsp_sysid.h
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6lp_clicker/include/bsp/bsp_sysid.h b/hw/bsp/pic32mx470_6lp_clicker/include/bsp/bsp_sysid.h
new file mode 100644
index 0000000..7b0a24b
--- /dev/null
+++ b/hw/bsp/pic32mx470_6lp_clicker/include/bsp/bsp_sysid.h
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef BSP_SYSID_H
+#define BSP_SYSID_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* stub until this BSP gets new HAL */
+enum system_device_id
+{
+ RESERVED,
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BSP_SYSID_H */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6lp_clicker/pkg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6lp_clicker/pkg.yml b/hw/bsp/pic32mx470_6lp_clicker/pkg.yml
new file mode 100644
index 0000000..2e4242c
--- /dev/null
+++ b/hw/bsp/pic32mx470_6lp_clicker/pkg.yml
@@ -0,0 +1,46 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: hw/bsp/pic32mx470_6lp_clicker
+pkg.type: bsp
+pkg.description: BSP definition for the 6LoWPAN Clicker board.
+pkg.author: "Apache Mynewt <de...@mynewt.incubator.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+ - pic32
+ - microchip
+ - clicker
+
+pkg.lflags:
+ - -Wl,--defsym=_min_heap_size=0x400
+
+pkg.deps:
+ - hw/mcu/microchip/pic32mx470f512h
+
+pkg.deps.UART_0:
+ - hw/drivers/uart/uart_hal
+
+pkg.deps.UART_1:
+ - hw/drivers/uart/uart_hal
+
+pkg.deps.UART_2:
+ - hw/drivers/uart/uart_hal
+
+pkg.deps.UART_3:
+ - hw/drivers/uart/uart_hal
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6lp_clicker/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6lp_clicker/src/hal_bsp.c b/hw/bsp/pic32mx470_6lp_clicker/src/hal_bsp.c
new file mode 100644
index 0000000..c1187c6
--- /dev/null
+++ b/hw/bsp/pic32mx470_6lp_clicker/src/hal_bsp.c
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#include "hal/hal_bsp.h"
+#include "bsp/bsp.h"
+#include <assert.h>
+
+const struct hal_flash *
+bsp_flash_dev(uint8_t id)
+{
+ return 0;
+}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6lp_clicker/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6lp_clicker/src/os_bsp.c b/hw/bsp/pic32mx470_6lp_clicker/src/os_bsp.c
new file mode 100644
index 0000000..8add7e2
--- /dev/null
+++ b/hw/bsp/pic32mx470_6lp_clicker/src/os_bsp.c
@@ -0,0 +1,85 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include "hal/hal_bsp.h"
+#include "syscfg/syscfg.h"
+#include "uart/uart.h"
+#if MYNEWT_VAL(UART_0) || MYNEWT_VAL(UART_1)
+#include "uart_hal/uart_hal.h"
+#endif
+
+#include <xc.h>
+
+#include <assert.h>
+
+#pragma config CP=1, FWDTEN=0, FCKSM=1, FPBDIV=1, OSCIOFNC=1, POSCMOD=1
+/* PLL conf div in: 2, mul: 20, div out: 1 8->4->80->80 */
+#pragma config FNOSC=3, FPLLODIV=0, UPLLEN=1, FPLLMUL=5, FPLLIDIV=1, FSRSSEL=7
+/* PGEC2/PGED2 pair is used */
+#pragma config ICESEL=2
+
+#if MYNEWT_VAL(UART_0)
+static struct uart_dev os_bsp_uart0;
+#endif
+
+#if MYNEWT_VAL(UART_1)
+static struct uart_dev os_bsp_uart1;
+#endif
+
+#if MYNEWT_VAL(UART_2)
+static struct uart_dev os_bsp_uart2;
+#endif
+
+#if MYNEWT_VAL(UART_3)
+static struct uart_dev os_bsp_uart3;
+#endif
+
+void _close(int fd);
+
+void
+hal_bsp_init(void)
+{
+ int rc;
+
+#if MYNEWT_VAL(UART_0)
+ rc = os_dev_create((struct os_dev *) &os_bsp_uart0, "uart0",
+ OS_DEV_INIT_PRIMARY, 0, uart_hal_init, 0);
+ assert(rc == 0);
+#endif
+
+#if MYNEWT_VAL(UART_1)
+ rc = os_dev_create((struct os_dev *) &os_bsp_uart1, "uart1",
+ OS_DEV_INIT_PRIMARY, 0, uart_hal_init, 0);
+ assert(rc == 0);
+#endif
+
+#if MYNEWT_VAL(UART_2)
+ rc = os_dev_create((struct os_dev *) &os_bsp_uart2, "uart2",
+ OS_DEV_INIT_PRIMARY, 0, uart_hal_init, 0);
+ assert(rc == 0);
+#endif
+
+#if MYNEWT_VAL(UART_3)
+ rc = os_dev_create((struct os_dev *) &os_bsp_uart3, "uart3",
+ OS_DEV_INIT_PRIMARY, 0, uart_hal_init, 0);
+ assert(rc == 0);
+#endif
+
+ (void)rc;
+}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6lp_clicker/src/sbrk.c
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6lp_clicker/src/sbrk.c b/hw/bsp/pic32mx470_6lp_clicker/src/sbrk.c
new file mode 100644
index 0000000..d3f99d6
--- /dev/null
+++ b/hw/bsp/pic32mx470_6lp_clicker/src/sbrk.c
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#define HEAPSIZE (1024)
+
+static char __Heap[HEAPSIZE];
+
+void *
+_sbrk(int incr)
+{
+ static char *brk = __Heap;
+
+ void *prev_brk;
+
+ if (incr < 0) {
+ /* Returning memory to the heap. */
+ incr = -incr;
+ if (brk - incr < __Heap) {
+ prev_brk = (void *)-1;
+ } else {
+ prev_brk = brk;
+ brk -= incr;
+ }
+ } else {
+ /* Allocating memory from the heap. */
+ if ((__Heap + HEAPSIZE) - brk >= incr) {
+ prev_brk = brk;
+ brk += incr;
+ } else {
+ prev_brk = (void *)-1;
+ }
+ }
+
+ return prev_brk;
+}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/bsp/pic32mx470_6lp_clicker/syscfg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/pic32mx470_6lp_clicker/syscfg.yml b/hw/bsp/pic32mx470_6lp_clicker/syscfg.yml
new file mode 100644
index 0000000..8d0fd17
--- /dev/null
+++ b/hw/bsp/pic32mx470_6lp_clicker/syscfg.yml
@@ -0,0 +1,41 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# Package: hw/bsp/pic32mx470_6lp_clicker
+
+syscfg.defs:
+ CLOCK_FREQ:
+ description: 'TBD'
+ value: 80000000ul
+
+ UART_0:
+ description: 'TBD'
+ value: 1
+
+ UART_1:
+ description: 'TBD'
+ value: 1
+
+ UART_2:
+ description: 'TBD'
+ value: 1
+
+ UART_3:
+ description: 'TBD'
+ value: 1
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/mcu/microchip/pic32mx470F512H/include/mcu/mips_bsp.h
----------------------------------------------------------------------
diff --git a/hw/mcu/microchip/pic32mx470F512H/include/mcu/mips_bsp.h b/hw/mcu/microchip/pic32mx470F512H/include/mcu/mips_bsp.h
deleted file mode 100644
index 01d75f4..0000000
--- a/hw/mcu/microchip/pic32mx470F512H/include/mcu/mips_bsp.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef H_MIPS_BSP_
-#define H_MIPS_BSP_
-
-extern const struct hal_flash native_flash_dev;
-
-#endif /* H_NATIVE_BSP_ */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/mcu/microchip/pic32mx470F512H/include/mcu/mips_hal.h
----------------------------------------------------------------------
diff --git a/hw/mcu/microchip/pic32mx470F512H/include/mcu/mips_hal.h b/hw/mcu/microchip/pic32mx470F512H/include/mcu/mips_hal.h
deleted file mode 100644
index f29bd2a..0000000
--- a/hw/mcu/microchip/pic32mx470F512H/include/mcu/mips_hal.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/* This file defines the HAL implementations within this MCU */
-
-#ifndef MIPS_HAL_H
-#define MIPS_HAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Helper functions to enable/disable interrupts. */
-#define __HAL_DISABLE_INTERRUPTS(__os_sr) do {__os_sr = __builtin_get_isr_state(); \
- __builtin_disable_interrupts();} while(0)
-
-#define __HAL_ENABLE_INTERRUPTS(__os_sr) __builtin_set_isr_state(__os_sr)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MCU_HAL_H */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/mcu/microchip/pic32mx470F512H/include/mcu/pic32.h
----------------------------------------------------------------------
diff --git a/hw/mcu/microchip/pic32mx470F512H/include/mcu/pic32.h b/hw/mcu/microchip/pic32mx470F512H/include/mcu/pic32.h
deleted file mode 100644
index 6dccd82..0000000
--- a/hw/mcu/microchip/pic32mx470F512H/include/mcu/pic32.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef __MCU_PIC32_H__
-#define __MCU_PIC32_H__
-
-#define OS_TICKS_PER_SEC (1000)
-
-#endif /* __MCU_PIC32_H__ */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/mcu/microchip/pic32mx470F512H/pkg.yml
----------------------------------------------------------------------
diff --git a/hw/mcu/microchip/pic32mx470F512H/pkg.yml b/hw/mcu/microchip/pic32mx470F512H/pkg.yml
deleted file mode 100644
index 41abc7d..0000000
--- a/hw/mcu/microchip/pic32mx470F512H/pkg.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-pkg.name: hw/mcu/microchip/pic32mx470F512H
-pkg.description: MCU definition for the Microchip PIC32MX470F512H microcontroller.
-pkg.author: "Apache Mynewt <de...@mynewt.incubator.apache.org>"
-pkg.homepage: "http://mynewt.apache.org/"
-pkg.keywords:
- - pic32
-
-pkg.cflags:
- - -mprocessor=32MX470F512H
-pkg.deps:
- - hw/hal
- - compiler/xc32
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/mcu/microchip/pic32mx470F512H/src/hal_os_tick.c
----------------------------------------------------------------------
diff --git a/hw/mcu/microchip/pic32mx470F512H/src/hal_os_tick.c b/hw/mcu/microchip/pic32mx470F512H/src/hal_os_tick.c
deleted file mode 100644
index 8fc68d6..0000000
--- a/hw/mcu/microchip/pic32mx470F512H/src/hal_os_tick.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <assert.h>
-#include <os/os.h>
-#include <hal/hal_os_tick.h>
-
-/*
- * XXX implement tickless mode.
- */
-void
-os_tick_idle(os_time_t ticks)
-{
- OS_ASSERT_CRITICAL();
-}
-
-void
-os_tick_init(uint32_t os_ticks_per_sec, int prio)
-{
-}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/mcu/microchip/pic32mx470F512H/src/hal_system.c
----------------------------------------------------------------------
diff --git a/hw/mcu/microchip/pic32mx470F512H/src/hal_system.c b/hw/mcu/microchip/pic32mx470F512H/src/hal_system.c
deleted file mode 100644
index ed6e6a3..0000000
--- a/hw/mcu/microchip/pic32mx470F512H/src/hal_system.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "hal/hal_system.h"
-
-#include <stdint.h>
-
-void
-hal_system_reset(void)
-{
- while (1) {
- }
-}
-
-int
-hal_debugger_connected(void)
-{
- return 0;
-}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/mcu/microchip/pic32mx470F512H/src/hal_uart.c
----------------------------------------------------------------------
diff --git a/hw/mcu/microchip/pic32mx470F512H/src/hal_uart.c b/hw/mcu/microchip/pic32mx470F512H/src/hal_uart.c
deleted file mode 100644
index 93eff5b..0000000
--- a/hw/mcu/microchip/pic32mx470F512H/src/hal_uart.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "hal/hal_uart.h"
-#include "bsp/bsp.h"
-#include "syscfg/syscfg.h"
-#include "mcu/mips_hal.h"
-#include <assert.h>
-#include <stdlib.h>
-
-#include <xc.h>
-
-struct hal_uart {
- volatile uint8_t u_rx_stall:1;
- volatile uint8_t u_rx_data;
- hal_uart_rx_char u_rx_func;
- hal_uart_tx_char u_tx_func;
- hal_uart_tx_done u_tx_done;
- void *u_func_arg;
-};
-static struct hal_uart uarts[UART_CNT];
-
-int
-hal_uart_init_cbs(int port, hal_uart_tx_char tx_func, hal_uart_tx_done tx_done,
- hal_uart_rx_char rx_func, void *arg)
-{
- uarts[port].u_rx_func = rx_func;
- uarts[port].u_tx_func = tx_func;
- uarts[port].u_tx_done = tx_done;
- uarts[port].u_func_arg = arg;
- return 0;
-}
-
-static void
-uart_disable_tx_int(int port)
-{
- switch (port) {
- case 0:
- IEC1CLR = _IEC1_U1TXIE_MASK;
- break;
- case 1:
- IEC1CLR = _IEC1_U2TXIE_MASK;
- break;
- case 2:
- IEC2CLR = _IEC2_U3TXIE_MASK;
- break;
- case 3:
- IEC2CLR = _IEC2_U4TXIE_MASK;
- break;
- }
-}
-
-static void
-uart_enable_tx_int(int port)
-{
- switch (port) {
- case 0:
- IEC1SET = _IEC1_U1TXIE_MASK;
- break;
- case 1:
- IEC1SET = _IEC1_U2TXIE_MASK;
- break;
- case 2:
- IEC2SET = _IEC2_U3TXIE_MASK;
- break;
- case 3:
- IEC2SET = _IEC2_U4TXIE_MASK;
- break;
- }
-}
-
-static void
-uart_disable_rx_int(int port)
-{
- switch (port) {
- case 0:
- IEC1CLR = _IEC1_U1RXIE_MASK;
- break;
- case 1:
- IEC1CLR = _IEC1_U2RXIE_MASK;
- break;
- case 2:
- IEC1CLR = _IEC1_U3RXIE_MASK;
- break;
- case 3:
- IEC2CLR = _IEC2_U4RXIE_MASK;
- break;
- }
-}
-
-static void
-uart_enable_rx_int(int port)
-{
- switch (port) {
- case 0:
- IEC1SET = _IEC1_U1RXIE_MASK;
- break;
- case 1:
- IEC1SET = _IEC1_U2RXIE_MASK;
- break;
- case 2:
- IEC1SET = _IEC1_U3RXIE_MASK;
- break;
- case 3:
- IEC2SET = _IEC2_U4RXIE_MASK;
- break;
- }
-}
-
-static void
-uart_receive_ready(int port)
-{
- switch (port) {
- case 0:
- uarts[port].u_rx_data = U1RXREG;
- break;
- case 1:
- uarts[port].u_rx_data = U2RXREG;
- break;
- case 2:
- uarts[port].u_rx_data = U3RXREG;
- break;
- case 3:
- uarts[port].u_rx_data = U4RXREG;
- break;
- }
-
- int c = uarts[port].u_rx_func(uarts[port].u_func_arg,
- uarts[port].u_rx_data);
- if (c < 0) {
- uart_disable_rx_int(port);
- uarts[port].u_rx_stall = 1;
- }
-}
-
-static void
-uart_transmit_ready(int port)
-{
- int c = uarts[port].u_tx_func(uarts[port].u_func_arg);
- if (c < 0) {
- uart_disable_tx_int(port);
-
- /* call tx done cb */
- if (uarts[port].u_tx_done) {
- uarts[port].u_tx_done(uarts[port].u_func_arg);
- }
- } else {
- /* write char out */
- switch (port) {
- case 0:
- U1TXREG = (uint32_t)c & 0xff;
- break;
- case 1:
- U2TXREG = (uint32_t)c & 0xff;
- break;
- case 2:
- U3TXREG = (uint32_t)c & 0xff;
- break;
- case 3:
- U4TXREG = (uint32_t)c & 0xff;
- break;
- }
- }
-}
-
-void
-__attribute__((interrupt(IPL1AUTO), vector(_UART_1_VECTOR))) uart_1_isr(void)
-{
- uint32_t sta = U1STA;
- if (sta & _U1STA_URXDA_MASK) {
- uart_receive_ready(0);
- IFS1CLR = _IFS1_U1RXIF_MASK;
- }
- if (sta & _U1STA_TRMT_MASK) {
- uart_transmit_ready(0);
- IFS1CLR = _IFS1_U1TXIF_MASK;
- }
-}
-
-void
-__attribute__((interrupt(IPL1AUTO), vector(_UART_2_VECTOR))) uart_2_isr(void)
-{
- uint32_t sta = U2STA;
- if (sta & _U2STA_URXDA_MASK) {
- uart_receive_ready(1);
- IFS1CLR = _IFS1_U2RXIF_MASK;
- }
- if (sta & _U2STA_TRMT_MASK) {
- uart_transmit_ready(1);
- IFS1CLR = _IFS1_U2TXIF_MASK;
- }
-}
-
-void
-__attribute__((interrupt(IPL1AUTO), vector(_UART_3_VECTOR))) uart_3_isr(void)
-{
- uint32_t sta = U3STA;
- if (sta & _U3STA_URXDA_MASK) {
- uart_receive_ready(2);
- IFS1CLR = _IFS1_U3RXIF_MASK;
- }
- if (sta & _U3STA_TRMT_MASK) {
- uart_transmit_ready(2);
- IFS2CLR = _IFS2_U3TXIF_MASK;
- }
-}
-
-void
-__attribute__((interrupt(IPL1AUTO), vector(_UART_4_VECTOR))) uart_4_isr(void)
-{
- uint32_t sta = U4STA;
- if (sta & _U4STA_URXDA_MASK) {
- uart_receive_ready(3);
- IFS2CLR = _IFS2_U4RXIF_MASK;
- }
- if (sta & _U4STA_TRMT_MASK) {
- uart_transmit_ready(3);
- IFS2CLR = _IFS2_U4TXIF_MASK;
- }
-}
-
-void
-hal_uart_start_rx(int port)
-{
- if (uarts[port].u_rx_stall) {
- /* recover saved data */
- uint32_t sr;
- __HAL_DISABLE_INTERRUPTS(sr);
- int c = uarts[port].u_rx_func(uarts[port].u_func_arg,
- uarts[port].u_rx_data);
- if (c >= 0) {
- uarts[port].u_rx_stall = 0;
- /* enable RX interrupt */
- uart_enable_rx_int(port);
- }
- __HAL_ENABLE_INTERRUPTS(sr);
- }
-}
-
-void
-hal_uart_start_tx(int port)
-{
- uart_enable_tx_int(port);
-}
-
-void
-hal_uart_blocking_tx(int port, uint8_t data)
-{
- switch (port){
- case 0:
- /* wait for transmit holding register to be empty */
- while(!(U1STA & _U1STA_TRMT_MASK)) {
- }
- /* write to transmit register */
- U1TXREG = data;
- break;
- case 1:
- /* wait for transmit holding register to be empty */
- while(!(U2STA & _U2STA_TRMT_MASK)) {
- }
- /* write to transmit register */
- U2TXREG = data;
- break;
- case 2:
- /* wait for transmit holding register to be empty */
- while(!(U3STA & _U3STA_TRMT_MASK)) {
- }
- /* write to transmit register */
- U3TXREG = data;
- break;
- case 3:
- /* wait for transmit holding register to be empty */
- while(!(U4STA & _U4STA_TRMT_MASK)) {
- }
- /* write to transmit register */
- U4TXREG = data;
- break;
- }
-}
-
-int
-hal_uart_init(int port, void *arg)
-{
- return 0;
-}
-
-int
-hal_uart_config(int port, int32_t baudrate, uint8_t databits, uint8_t stopbits,
- enum hal_uart_parity parity, enum hal_uart_flow_ctl flow_ctl)
-{
- uint32_t peripheral_clk = MYNEWT_VAL(CLOCK_FREQ) / 2;
-
- // check input
- if ((databits < 8) || (databits > 9) || (stopbits < 1) || (stopbits > 2)) {
- return -1;
- }
-
- /* XXX: flow control currently unsupported */
- (void) flow_ctl;
- uarts[port].u_rx_stall = 0;
-
- uint16_t mode = _U1MODE_BRGH_MASK | (stopbits >> 1);
- switch (parity) {
- case HAL_UART_PARITY_NONE:
- if (databits == 9) {
- mode |= _U1MODE_PDSEL_MASK;
- }
- break;
- case HAL_UART_PARITY_ODD:
- if (databits == 9) { // PIC does not do 9 bit data + parity.
- return -1;
- }
- mode |= _U1MODE_PDSEL1_MASK;
- break;
- case HAL_UART_PARITY_EVEN:
- if (databits == 9) {
- return -1;
- }
- mode |= _U1MODE_PDSEL0_MASK;
- break;
- default:
- return -1;
- }
-
- uint16_t divisor = peripheral_clk / (4 * baudrate) - 1;
-
- switch (port) {
- case 0:
- /* disable */
- U1MODE = 0;
- __asm__("nop");
- U1BRG = divisor;
- U1MODE = mode;
- U1STA = _U1STA_URXEN_MASK | _U1STA_UTXEN_MASK;
- /* clear RX interrupt flag */
- IFS1CLR = _IFS1_U1RXIF_MASK;
-
- /* enable RX interrupt */
- IEC1SET = _IEC1_U1RXIE_MASK;
-
- /* set interrupt priority */
- IPC7CLR = _IPC7_U1IP_MASK;
- IPC7SET = (1 << _IPC7_U1IP_POSITION); // priority 1
- /* set interrupt subpriority */
- IPC7CLR = _IPC7_U1IS_MASK;
- IPC7SET = (0 << _IPC7_U1IS_POSITION); // subpriority 0
- U1MODESET = _U1MODE_ON_MASK;
- break;
- case 1:
- /* disable */
- U2MODE = 0;
- __asm__("nop");
- U2BRG = divisor;
- U2MODE = mode;
- U2STA = _U2STA_URXEN_MASK | _U2STA_UTXEN_MASK;
- /* clear RX interrupt flag */
- IFS1CLR = _IFS1_U2RXIF_MASK;
-
- /* enable RX interrupt */
- IEC1SET = _IEC1_U2RXIE_MASK;
-
- /* set interrupt priority */
- IPC9CLR = _IPC9_U2IP_MASK;
- IPC9SET = (1 << _IPC9_U2IP_POSITION); // priority 1
- /* set interrupt subpriority */
- IPC9CLR = _IPC9_U2IS_MASK;
- IPC9SET = (0 << _IPC9_U2IS_POSITION); // subpriority 0
- U2MODESET = _U2MODE_ON_MASK;
- break;
- case 2:
- /* disable */
- U3MODE = 0;
- __asm__("nop");
- U3BRG = divisor;
- U3MODE = mode;
- U3STA = _U3STA_URXEN_MASK | _U3STA_UTXEN_MASK;
- /* clear RX interrupt flag */
- IFS1CLR = _IFS1_U3RXIF_MASK;
-
- /* enable RX interrupt */
- IEC1SET = _IEC1_U3RXIE_MASK;
-
- /* set interrupt priority */
- IPC9CLR = _IPC9_U3IP_MASK;
- IPC9SET = (1 << _IPC9_U3IP_POSITION); // priority 1
- /* set interrupt subpriority */
- IPC9CLR = _IPC9_U3IS_MASK;
- IPC9SET = (0 << _IPC9_U3IS_POSITION); // subpriority 0
- U3MODESET = _U3MODE_ON_MASK;
- break;
- case 3:
- /* disable */
- U4MODE = 0;
- __asm__("nop");
- U4BRG = divisor;
- U4MODE = mode;
- U4STA = _U4STA_URXEN_MASK | _U4STA_UTXEN_MASK;
- /* clear RX interrupt flag */
- IFS2CLR = _IFS2_U4RXIF_MASK;
-
- /* enable RX interrupt */
- IEC2SET = _IEC2_U4RXIE_MASK;
-
- /* set interrupt priority */
- IPC9CLR = _IPC9_U4IP_MASK;
- IPC9SET = (1 << _IPC9_U4IP_POSITION); // priority 1
- /* set interrupt subpriority */
- IPC9CLR = _IPC9_U4IS_MASK;
- IPC9SET = (0 << _IPC9_U4IS_POSITION); // subpriority 0
- U4MODESET = _U4MODE_ON_MASK;
- break;
- }
- return 0;
-}
-
-int
-hal_uart_close(int port)
-{
- switch(port) {
- case 0:
- /* disable */
- U1MODE = 0;
- /* disable RX interrupt */
- IEC1CLR = _IEC1_U1RXIE_MASK;
- break;
- case 1:
- /* disable */
- U2MODE = 0;
- /* disable RX interrupt */
- IEC1CLR = _IEC1_U2RXIE_MASK;
- break;
- case 2:
- U3MODE = 0;
- /* disable RX interrupt */
- IEC1CLR = _IEC1_U3RXIE_MASK;
- break;
- case 3:
- /* disable */
- U4MODE = 0;
- /* disable RX interrupt */
- IEC2CLR = _IEC2_U4RXIE_MASK;
- break;
- default:
- return -1;
- }
- return 0;
-}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/mcu/microchip/pic32mx470F512H/src/hal_watchdog.c
----------------------------------------------------------------------
diff --git a/hw/mcu/microchip/pic32mx470F512H/src/hal_watchdog.c b/hw/mcu/microchip/pic32mx470F512H/src/hal_watchdog.c
deleted file mode 100644
index 392b967..0000000
--- a/hw/mcu/microchip/pic32mx470F512H/src/hal_watchdog.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include "hal/hal_watchdog.h"
-
-#include <assert.h>
-
-int
-hal_watchdog_init(uint32_t expire_msecs)
-{
- return (0);
-}
-
-void
-hal_watchdog_enable(void)
-{
-}
-
-void
-hal_watchdog_tickle(void)
-{
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/mcu/microchip/pic32mx470f512h/include/mcu/mcu.h
----------------------------------------------------------------------
diff --git a/hw/mcu/microchip/pic32mx470f512h/include/mcu/mcu.h b/hw/mcu/microchip/pic32mx470f512h/include/mcu/mcu.h
new file mode 100644
index 0000000..a2d7c8b
--- /dev/null
+++ b/hw/mcu/microchip/pic32mx470f512h/include/mcu/mcu.h
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef __MCU_MCU_H_
+#define __MCU_MCU_H_
+
+#include "p32mx470f512h.h"
+
+#endif /* __MCU_MCU_H_ */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/mcu/microchip/pic32mx470f512h/include/mcu/mips_bsp.h
----------------------------------------------------------------------
diff --git a/hw/mcu/microchip/pic32mx470f512h/include/mcu/mips_bsp.h b/hw/mcu/microchip/pic32mx470f512h/include/mcu/mips_bsp.h
new file mode 100644
index 0000000..01d75f4
--- /dev/null
+++ b/hw/mcu/microchip/pic32mx470f512h/include/mcu/mips_bsp.h
@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef H_MIPS_BSP_
+#define H_MIPS_BSP_
+
+extern const struct hal_flash native_flash_dev;
+
+#endif /* H_NATIVE_BSP_ */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2e8de777/hw/mcu/microchip/pic32mx470f512h/include/mcu/mips_hal.h
----------------------------------------------------------------------
diff --git a/hw/mcu/microchip/pic32mx470f512h/include/mcu/mips_hal.h b/hw/mcu/microchip/pic32mx470f512h/include/mcu/mips_hal.h
new file mode 100644
index 0000000..f29bd2a
--- /dev/null
+++ b/hw/mcu/microchip/pic32mx470f512h/include/mcu/mips_hal.h
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* This file defines the HAL implementations within this MCU */
+
+#ifndef MIPS_HAL_H
+#define MIPS_HAL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Helper functions to enable/disable interrupts. */
+#define __HAL_DISABLE_INTERRUPTS(__os_sr) do {__os_sr = __builtin_get_isr_state(); \
+ __builtin_disable_interrupts();} while(0)
+
+#define __HAL_ENABLE_INTERRUPTS(__os_sr) __builtin_set_isr_state(__os_sr)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MCU_HAL_H */