summaryrefslogtreecommitdiff
path: root/ports/nrf/common-hal/microcontroller
diff options
context:
space:
mode:
authorKevin Townsend <contact@microbuilder.eu>2017-11-23 13:38:38 +0100
committerKevin Townsend <contact@microbuilder.eu>2017-11-23 13:38:38 +0100
commitce75a21e50c7f0dcfed1333876d2fa44dc08e67c (patch)
tree8cbb96ff436f5dbf8bca98e35e2f7ad65db4e7a8 /ports/nrf/common-hal/microcontroller
parent92113dde815ce5aaecf63ea9e87bc4addcabd822 (diff)
Revert "Supervisor REPL support for ports/nrf/boards/feather52"
This reverts commit 92113dde815ce5aaecf63ea9e87bc4addcabd822.
Diffstat (limited to 'ports/nrf/common-hal/microcontroller')
-rw-r--r--ports/nrf/common-hal/microcontroller/Pin.c75
-rw-r--r--ports/nrf/common-hal/microcontroller/Pin.h40
-rw-r--r--ports/nrf/common-hal/microcontroller/Processor.c37
-rw-r--r--ports/nrf/common-hal/microcontroller/Processor.h37
-rw-r--r--ports/nrf/common-hal/microcontroller/__init__.c51
5 files changed, 0 insertions, 240 deletions
diff --git a/ports/nrf/common-hal/microcontroller/Pin.c b/ports/nrf/common-hal/microcontroller/Pin.c
deleted file mode 100644
index ee07ff09a..000000000
--- a/ports/nrf/common-hal/microcontroller/Pin.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "common-hal/microcontroller/Pin.h"
-#include "shared-bindings/microcontroller/Pin.h"
-
-#include "py/mphal.h"
-
-#if 0
-
-extern volatile bool adc_in_use;
-
-bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t* pin) {
- if (pin == &pin_TOUT) {
- return !adc_in_use;
- }
- if (pin->gpio_number == NO_GPIO || pin->gpio_number == SPECIAL_CASE) {
- return false;
- }
- return (READ_PERI_REG(pin->peripheral) &
- (PERIPHS_IO_MUX_FUNC<<PERIPHS_IO_MUX_FUNC_S)) == 0 &&
- (GPIO_REG_READ(GPIO_ENABLE_ADDRESS) & (1 << pin->gpio_number)) == 0 &&
- (READ_PERI_REG(pin->peripheral) & PERIPHS_IO_MUX_PULLUP) == 0;
-}
-
-void reset_pins(void) {
- for (int i = 0; i < 17; i++) {
- // 5 is RXD, 6 is TXD
- if ((i > 4 && i < 13) || i == 12) {
- continue;
- }
- uint32_t peripheral = PERIPHS_IO_MUX + i * 4;
- PIN_FUNC_SELECT(peripheral, 0);
- PIN_PULLUP_DIS(peripheral);
- // Disable the pin.
- gpio_output_set(0x0, 0x0, 0x0, 1 << i);
- }
-}
-#endif
-
-bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t* pin) {
- return true;
-}
-
-void reset_all_pins(void) {
-}
-
-void reset_pin(uint8_t pin) {
-
-}
-
-
diff --git a/ports/nrf/common-hal/microcontroller/Pin.h b/ports/nrf/common-hal/microcontroller/Pin.h
deleted file mode 100644
index d7994bc0c..000000000
--- a/ports/nrf/common-hal/microcontroller/Pin.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Scott Shawcroft
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_MICROCONTROLLER_PIN_H
-#define MICROPY_INCLUDED_NRF_COMMON_HAL_MICROCONTROLLER_PIN_H
-
-#include "py/mphal.h"
-#include "modules/machine/pin.h"
-
-//typedef pin_obj_t mcu_pin_obj_t;
-#define mcu_pin_obj_t pin_obj_t
-void reset_all_pins(void);
-void reset_pin(uint8_t pin);
-//void claim_pin(const mcu_pin_obj_t* pin);
-
-
-#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_MICROCONTROLLER_PIN_H
diff --git a/ports/nrf/common-hal/microcontroller/Processor.c b/ports/nrf/common-hal/microcontroller/Processor.c
deleted file mode 100644
index 4e74a4909..000000000
--- a/ports/nrf/common-hal/microcontroller/Processor.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Dan Halbert for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "common-hal/microcontroller/Processor.h"
-
-// TODO port common_hal_mcu_processor
-float common_hal_mcu_processor_get_temperature(void) {
- return 0;
-}
-
-uint32_t common_hal_mcu_processor_get_frequency(void) {
- return 64000000ul;
-}
-
diff --git a/ports/nrf/common-hal/microcontroller/Processor.h b/ports/nrf/common-hal/microcontroller/Processor.h
deleted file mode 100644
index 00d95ad4f..000000000
--- a/ports/nrf/common-hal/microcontroller/Processor.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Dan Halbert for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
-#define MICROPY_INCLUDED_NRF_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
-
-#include "py/obj.h"
-
-typedef struct {
- mp_obj_base_t base;
- // Stores no state currently.
-} mcu_processor_obj_t;
-
-#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
diff --git a/ports/nrf/common-hal/microcontroller/__init__.c b/ports/nrf/common-hal/microcontroller/__init__.c
deleted file mode 100644
index ddf0d252c..000000000
--- a/ports/nrf/common-hal/microcontroller/__init__.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "common-hal/microcontroller/Pin.h"
-#include "common-hal/microcontroller/Processor.h"
-
-#include "shared-bindings/microcontroller/Pin.h"
-#include "shared-bindings/microcontroller/Processor.h"
-
-// TODO porting common_hal_mcu
-void common_hal_mcu_delay_us(uint32_t delay) {
-// os_delay_us(delay);
-}
-
-void common_hal_mcu_disable_interrupts() {
-}
-
-void common_hal_mcu_enable_interrupts() {
-}
-
-// The singleton microcontroller.Processor object, returned by microcontroller.cpu
-// It currently only has properties, and no state.
-mcu_processor_obj_t common_hal_mcu_processor_obj = {
- .base = {
- .type = &mcu_processor_type,
- },
-};
-