Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 9 additions & 22 deletions locale/circuitpython.pot
Original file line number Diff line number Diff line change
Expand Up @@ -1547,12 +1547,6 @@ msgstr ""
msgid "Unable to start mDNS query"
msgstr ""

#: ports/espressif/common-hal/memorymap/AddressRange.c
#: ports/nordic/common-hal/memorymap/AddressRange.c
#: ports/raspberrypi/common-hal/memorymap/AddressRange.c
msgid "Address range not allowed"
msgstr ""

#: ports/espressif/common-hal/nvm/ByteArray.c
msgid "NVS Error"
msgstr ""
Expand Down Expand Up @@ -1933,14 +1927,6 @@ msgstr ""
msgid "Out of MDNS service slots"
msgstr ""

#: ports/raspberrypi/common-hal/memorymap/AddressRange.c
msgid "Unable to access unaligned IO register"
msgstr ""

#: ports/raspberrypi/common-hal/memorymap/AddressRange.c
msgid "Unable to write to read-only memory"
msgstr ""

#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
msgid "All timers for this pin are in use"
msgstr ""
Expand Down Expand Up @@ -3013,8 +2999,7 @@ msgid "substring not found"
msgstr ""

#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
#: shared-bindings/nvm/ByteArray.c
#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
msgid "only slices with step=1 (aka None) are supported"
msgstr ""

Expand All @@ -3023,7 +3008,7 @@ msgid "lhs and rhs should be compatible"
msgstr ""

#: py/objarray.c shared-bindings/alarm/SleepMemory.c
#: shared-bindings/memorymap/AddressRange.c shared-bindings/nvm/ByteArray.c
#: shared-bindings/nvm/ByteArray.c
msgid "array/bytes required on right side"
msgstr ""

Expand Down Expand Up @@ -3643,13 +3628,11 @@ msgstr ""
msgid "CBC blocks must be multiples of 16 bytes"
msgstr ""

#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
#: shared-bindings/nvm/ByteArray.c
#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
msgid "Slice and value different lengths."
msgstr ""

#: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c
#: shared-bindings/nvm/ByteArray.c
#: shared-bindings/alarm/SleepMemory.c shared-bindings/nvm/ByteArray.c
msgid "Array values should be single bytes."
msgstr ""

Expand Down Expand Up @@ -4038,7 +4021,7 @@ msgid ""
"Failed to add service TXT record; non-string or bytes found in txt_records"
msgstr ""

#: shared-bindings/memorymap/AddressRange.c
#: shared-bindings/memorymap/__init__.c
msgid "Address range wraps around"
msgstr ""

Expand Down Expand Up @@ -4372,6 +4355,10 @@ msgstr ""
msgid "%q() without %q()"
msgstr ""

#: shared-module/memorymap/AddressRange.c shared-module/memorymap/__init__.c
msgid "Address range not allowed"
msgstr ""

#: shared-module/memorymonitor/AllocationAlarm.c
#, c-format
msgid "Attempt to allocate %d blocks"
Expand Down
83 changes: 0 additions & 83 deletions ports/espressif/common-hal/memorymap/AddressRange.c

This file was deleted.

15 changes: 0 additions & 15 deletions ports/espressif/common-hal/memorymap/AddressRange.h

This file was deleted.

7 changes: 0 additions & 7 deletions ports/espressif/common-hal/memorymap/__init__.c

This file was deleted.

18 changes: 18 additions & 0 deletions ports/espressif/common-hal/memorymap/ranges.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@

// This file is part of the CircuitPython project: https://circuitpython.org
//
// SPDX-FileCopyrightText: Copyright (c) 2020 microDev
//
// SPDX-License-Identifier: MIT

#include <stdint.h>
#include "shared-module/memorymap/__init__.h"
#include "soc/soc.h"

const static memorymap_range_t memorymap_ranges[] = {
{(uint8_t *)SOC_RTC_DATA_LOW, SOC_RTC_DATA_HIGH - SOC_RTC_DATA_LOW},
// CPU accessible RAM that is preserved during sleep if the RTC power domain is left on.
{(uint8_t *)SOC_RTC_DRAM_LOW, SOC_RTC_DRAM_HIGH - SOC_RTC_DRAM_LOW},
// RTC peripheral registers
{(uint8_t *)0x60008000, 0x9000}
};
114 changes: 0 additions & 114 deletions ports/nordic/common-hal/memorymap/AddressRange.c

This file was deleted.

7 changes: 0 additions & 7 deletions ports/nordic/common-hal/memorymap/__init__.c

This file was deleted.

51 changes: 51 additions & 0 deletions ports/nordic/common-hal/memorymap/ranges.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// This file is part of the CircuitPython project: https://circuitpython.org
//
// SPDX-FileCopyrightText: Copyright (c) 2020 microDev
//
// SPDX-License-Identifier: MIT

#include <string.h>
#include "nrf.h"

#include "shared-bindings/memorymap/__init__.h"

#include "py/runtime.h"


#ifdef NRF51_SERIES
const static memorymap_range_t memorymap_ranges[] = {
// FLASH
{(uint8_t *)0x00000000, 0x00040000},
// FICR & UICR ranges
{(uint8_t *)0x10000000, 0x00002000},
// RAM
{(uint8_t *)0x20000000, 0x00010000},
// PERIPHERALS
{(uint8_t *)0x40000000, 0x20000000}
};
#elif defined NRF52_SERIES
const static memorymap_range_t memorymap_ranges[] = {
// FLASH
{(uint8_t *)0x00000000, 0x00100000},
// FICR & UICR ranges
{(uint8_t *)0x10000000, 0x00002000},
// RAM
{(uint8_t *)0x20000000, 0x00040000},
// PERIPHERALS
{(uint8_t *)0x40000000, 0x20000000}
};
#elif defined NRF53_SERIES
const static memorymap_range_t memorymap_ranges[] = {
// FLASH
{(uint8_t *)0x00000000, 0x00100000},
// FICR & UICR ranges
{(uint8_t *)0x00FF0000, 0x00010000},
// RAM
{(uint8_t *)0x20000000, 0x00080000},
// PERIPHERALS
{(uint8_t *)0x40000000, 0x20000000},
{(uint8_t *)0xE0000000, 0x00100000}
};
#else
#error "Unsupported nRF variant"
#endif
2 changes: 1 addition & 1 deletion ports/raspberrypi/bindings/rp2pio/StateMachine.c
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_pc_obj, rp2pio_statemachine_ob
MP_PROPERTY_GETTER(rp2pio_statemachine_pc_obj,
(mp_obj_t)&rp2pio_statemachine_get_pc_obj);

//| rxfifo: memorymap.AddressRange
//| rxfifo: memoryview
//| """Access the state machine's rxfifo directly
//|
//| If the state machine's fifo mode is ``txput`` then accessing this object
Expand Down
Loading
Loading