#ifdef __cplusplus crust

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
-

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 */
-

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 */