From 0f2d455a42d95ddd1eaf3386537bc6470e4dbb9d Mon Sep 17 00:00:00 2001 From: Lucas Schumacher Date: Tue, 26 Sep 2023 14:41:44 -0400 Subject: [PATCH] Remove unused heap allocator --- .cargo/config.toml | 2 +- Cargo.toml | 1 - src/main.rs | 14 -------------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 2f1503d..37e9bdb 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -14,4 +14,4 @@ rustflags = [ target = "xtensa-esp32-none-elf" [unstable] -build-std = ["alloc", "core"] +build-std = ["core"] diff --git a/Cargo.toml b/Cargo.toml index bb84301..03a3940 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,5 @@ hal = { package = "esp32-hal", version = "0.15.0" } esp-backtrace = { version = "0.8.0", features = ["esp32", "panic-handler", "exception-handler", "print-uart"] } esp-println = { version = "0.6.0", features = ["esp32","log"] } log = { version = "0.4.18" } -esp-alloc = { version = "0.3.0" } si5351 = "0.2.0" embedded-hal = "0.2.7" diff --git a/src/main.rs b/src/main.rs index da62636..399d2ce 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,6 @@ #![no_std] #![no_main] -extern crate alloc; -use core::mem::MaybeUninit; use esp_backtrace as _; use embedded_hal::serial::Read; @@ -19,20 +17,8 @@ use hal::{ use si5351::{Si5351, Si5351Device}; -#[global_allocator] -static ALLOCATOR: esp_alloc::EspHeap = esp_alloc::EspHeap::empty(); - -fn init_heap() { - const HEAP_SIZE: usize = 32 * 1024; - static mut HEAP: MaybeUninit<[u8; HEAP_SIZE]> = MaybeUninit::uninit(); - - unsafe { - ALLOCATOR.init(HEAP.as_mut_ptr() as *mut u8, HEAP_SIZE); - } -} #[entry] fn main() -> ! { - init_heap(); let peripherals = Peripherals::take(); //let uart = peripherals.UART0; let mut system = peripherals.DPORT.split();