Move ExtensionData inside Port

These are strongly coupled anyways, and removes it from the global namespace.

Author: dmadison

src/internal/ExtensionController.cpp

@@ -98,7 +98,7 @@ void ExtensionPort::setControlData(uint8_t index, uint8_t val) {
 	data.controlData[index] = val;
 }
 
-ExtensionData & ExtensionPort::getExtensionData() const {
+ExtensionPort::ExtensionData & ExtensionPort::getExtensionData() const {
 	return data;
 }
 

src/internal/ExtensionController.h

@@ -28,22 +28,22 @@
 #include "NXC_Utils.h"
 #include "NXC_DataMaps.h"
 
-class ExtensionData {
-	friend class ExtensionPort;
+class ExtensionPort {
 public:
-	ExtensionData(NXC_I2C_TYPE& i2cbus = NXC_I2C_DEFAULT) :
-		i2c(i2cbus) {}
+	class ExtensionData {
+		friend class ExtensionPort;
+	public:
+		ExtensionData(NXC_I2C_TYPE& i2cbus = NXC_I2C_DEFAULT) :
+			i2c(i2cbus) {}
 
-	static const uint8_t ControlDataSize = 21;  // Largest reporting mode (0x3d)
+		static const uint8_t ControlDataSize = 21;  // Largest reporting mode (0x3d)
 
-protected:
-	NXC_I2C_TYPE & i2c;  // Reference for the I2C (Wire) class
-	ExtensionType connectedType = ExtensionType::NoController;
-	uint8_t controlData[ControlDataSize];
-};
+	protected:
+		NXC_I2C_TYPE & i2c;  // Reference for the I2C (Wire) class
+		ExtensionType connectedType = ExtensionType::NoController;
+		uint8_t controlData[ControlDataSize];
+	};
 
-class ExtensionPort {
-public:
 	ExtensionPort(ExtensionData& dataRef);
 
 	void begin();
@@ -128,7 +128,7 @@ namespace NintendoExtensionCtrl {
 		//    * Control data array
 		// This data can be shared between controller instances using a single
 		// logical endpoint to keep memory down.
-		ExtensionData portData;
+		ExtensionPort::ExtensionData portData;
 	};
 }