From b14ca428fb854702beaec5304dd65a428c82841a Mon Sep 17 00:00:00 2001
From: Matthew Kennedy <matthewkennedy@outlook.com>
Date: Mon, 28 Aug 2023 14:17:26 -0700
Subject: [PATCH] #ifdef __cplusplus crust

---
 firmware/hw_layer/pin_repository.h         | 26 +++++++---------------
 simulator/simulator/boards.h               | 11 ---------
 simulator/simulator/rusEfiFunctionalTest.h |  9 --------
 3 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/firmware/hw_layer/pin_repository.h b/firmware/hw_layer/pin_repository.h
index c9b35f62e8..e288a49d3c 100644
--- a/firmware/hw_layer/pin_repository.h
+++ b/firmware/hw_layer/pin_repository.h
@@ -14,40 +14,33 @@
 #include "io_pins.h"
 #include "efi_gpio.h"
 
-#ifdef __cplusplus
-
-class PinRepository {
-	public:
-	/**
-	 * Class constructors are a great way to have simple initialization sequence
-	 */
+struct PinRepository {
+public:
 	PinRepository();
 	const char *PIN_USED[BRAIN_PIN_TOTAL_PINS];
 };
 
-#endif /* __cplusplus */
-
 bool isBrainPinValid(brain_pin_e brainPin);
 
 void initPinRepository(void);
-EXTERNC bool brain_pin_is_onchip(brain_pin_e brainPin);
-EXTERNC bool brain_pin_is_ext(brain_pin_e brainPin);
+bool brain_pin_is_onchip(brain_pin_e brainPin);
+bool brain_pin_is_ext(brain_pin_e brainPin);
 void pinDiag2string(char *buffer, size_t size, brain_pin_diag_e pin_diag);
 
 /**
  * Usually high-level code would invoke efiSetPadMode, not this method directly
  */
-EXTERNC bool brain_pin_markUsed(brain_pin_e brainPin, const char *msg);
+bool brain_pin_markUsed(brain_pin_e brainPin, const char *msg);
 /**
  * See also efiSetPadUnused
  */
-EXTERNC void brain_pin_markUnused(brain_pin_e brainPin);
+void brain_pin_markUnused(brain_pin_e brainPin);
 const char * getPinFunction(brain_input_pin_e brainPin);
 
 #if EFI_PROD_CODE
 /* For on-chip gpios only */
-EXTERNC bool gpio_pin_markUsed(ioportid_t port, ioportmask_t pin, const char *msg);
-EXTERNC void gpio_pin_markUnused(ioportid_t port, ioportmask_t pin);
+bool gpio_pin_markUsed(ioportid_t port, ioportmask_t pin, const char *msg);
+void gpio_pin_markUnused(ioportid_t port, ioportmask_t pin);
 #endif /* EFI_PROD_CODE*/
 
 /* defined in ports/ */
@@ -61,7 +54,4 @@ const char *hwPortname(brain_pin_e brainPin);
 // the main usage for human-readable board-specific pin reference is convenience of error messages in case of pin conflict.
 const char * getBoardSpecificPinName(brain_pin_e brainPin);
 
-#ifdef __cplusplus
 const char* & getBrainUsedPin(unsigned int idx);
-#endif
-
diff --git a/simulator/simulator/boards.h b/simulator/simulator/boards.h
index c3ed2b4fa6..3f176298bc 100644
--- a/simulator/simulator/boards.h
+++ b/simulator/simulator/boards.h
@@ -34,14 +34,3 @@ typedef uint16_t adcsample_t;
 #define spiAcquireBus(x) {}
 #define spiReleaseBus(x) {}
 // end of mock SPI
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
diff --git a/simulator/simulator/rusEfiFunctionalTest.h b/simulator/simulator/rusEfiFunctionalTest.h
index 94dcf83727..1597175652 100644
--- a/simulator/simulator/rusEfiFunctionalTest.h
+++ b/simulator/simulator/rusEfiFunctionalTest.h
@@ -7,15 +7,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
 void rusEfiFunctionalTest(void);
 void printPendingMessages(void);
 void logMsg(const char *fmt, ...);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */