From 3b6a3cf3a4215889f803e3c1b9e684e2248e2db5 Mon Sep 17 00:00:00 2001
From: Jesse Braham <jessebraham@users.noreply.github.com>
Date: Fri, 1 Mar 2024 13:56:02 +0000
Subject: [PATCH] Fix some clippy/build warnings, clean up root Cargo manifest
 (#1230)

* Remove old package names from workspace exclude list

* Fix warning in `esp-hal-procmacros`

* Resolve clippy warnings
---
 Cargo.toml                          |  8 --------
 esp-hal-procmacros/src/interrupt.rs |  2 +-
 esp-hal/src/soc/esp32c6/trng.rs     |  2 +-
 esp-hal/src/soc/esp32h2/trng.rs     | 10 +---------
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0c5c8670d..7a6512bae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,13 +7,5 @@ exclude  = [
     "esp-hal-smartled",
     "esp-lp-hal",
     "esp-riscv-rt",
-    "esp32-hal",
-    "esp32c2-hal",
-    "esp32c3-hal",
-    "esp32c6-hal",
-    "esp32h2-hal",
-    "esp32p4-hal",
-    "esp32s2-hal",
-    "esp32s3-hal",
     "examples",
 ]
diff --git a/esp-hal-procmacros/src/interrupt.rs b/esp-hal-procmacros/src/interrupt.rs
index 0b4f47fba..aef0a966c 100644
--- a/esp-hal-procmacros/src/interrupt.rs
+++ b/esp-hal-procmacros/src/interrupt.rs
@@ -1,4 +1,4 @@
-use proc_macro::{self, TokenStream};
+use proc_macro::TokenStream;
 use syn::{parse::Error, spanned::Spanned, AttrStyle, Attribute};
 
 pub(crate) enum WhiteListCaller {
diff --git a/esp-hal/src/soc/esp32c6/trng.rs b/esp-hal/src/soc/esp32c6/trng.rs
index 914cd7990..42389e783 100644
--- a/esp-hal/src/soc/esp32c6/trng.rs
+++ b/esp-hal/src/soc/esp32c6/trng.rs
@@ -200,7 +200,7 @@ pub(crate) fn ensure_randomness() {
     let pattern_one: u32 = (SAR2_CHANNEL << 2) | SAR2_ATTEN; // we want channel 9 with max attenuation
     let pattern_two: u32 = SAR1_ATTEN; // we want channel 0 with max attenuation, channel doesn't really matter here
     let pattern_table: u32 =
-        0 | (pattern_two << 3 * PATTERN_BIT_WIDTH) | pattern_one << 2 * PATTERN_BIT_WIDTH;
+        (pattern_two << (3 * PATTERN_BIT_WIDTH)) | (pattern_one << (2 * PATTERN_BIT_WIDTH));
 
     reg_write(APB_SARADC_SAR_PATT_TAB1_REG, pattern_table);
 
diff --git a/esp-hal/src/soc/esp32h2/trng.rs b/esp-hal/src/soc/esp32h2/trng.rs
index 569c59931..d987c4b96 100644
--- a/esp-hal/src/soc/esp32h2/trng.rs
+++ b/esp-hal/src/soc/esp32h2/trng.rs
@@ -36,14 +36,6 @@ const I2C_SARADC_SAR1_INIT_CODE_LSB: u8 = 3;
 const I2C_SARADC_SAR1_INIT_CODE_LSB_MSB: u8 = 7;
 const I2C_SARADC_SAR1_INIT_CODE_LSB_LSB: u8 = 0;
 
-const DTEST_RTC_MSB: u8 = 1;
-const DTEST_RTC_LSB: u8 = 0;
-const ENT_RTC_MSB: u8 = 3;
-const ENT_RTC_LSB: u8 = 3;
-const SARADC1_ENCAL_REF_MSB: u8 = 4;
-const SARADC1_ENCAL_REF_LSB: u8 = 4;
-const SARADC2_ENCAL_REF_MSB: u8 = 6;
-const SARADC2_ENCAL_REF_LSB: u8 = 6;
 const SAR2_CHANNEL: u32 = 9;
 const SAR2_ATTEN: u32 = 1;
 const SAR1_ATTEN: u32 = 1;
@@ -195,7 +187,7 @@ pub(crate) fn ensure_randomness() {
     let pattern_one: u32 = (SAR2_CHANNEL << 2) | SAR2_ATTEN; // we want channel 9 with max attenuation
     let pattern_two: u32 = SAR1_ATTEN; // we want channel 0 with max attenuation, channel doesn't really matter here
     let pattern_table: u32 =
-        0 | (pattern_two << 3 * PATTERN_BIT_WIDTH) | pattern_one << 2 * PATTERN_BIT_WIDTH;
+        (pattern_two << (3 * PATTERN_BIT_WIDTH)) | (pattern_one << (2 * PATTERN_BIT_WIDTH));
     reg_write(APB_SARADC_SAR_PATT_TAB1_REG, pattern_table);
 
     // set pattern length to 2 (APB_SARADC_SAR_PATT_LEN counts from 0)