From 503533c6fe781990f688b15d9bcf38b19e671377 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Mon, 7 Dec 2015 17:01:34 -0200
Subject: [PATCH] AP_HAL_PX4: rename AP_HAL_Empty instances

---
 libraries/AP_HAL_PX4/HAL_PX4_Class.cpp | 4 ++--
 libraries/AP_HAL_PX4/I2CDriver.h       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/AP_HAL_PX4/HAL_PX4_Class.cpp b/libraries/AP_HAL_PX4/HAL_PX4_Class.cpp
index da2a4a9d42..57bc46c5de 100644
--- a/libraries/AP_HAL_PX4/HAL_PX4_Class.cpp
+++ b/libraries/AP_HAL_PX4/HAL_PX4_Class.cpp
@@ -32,8 +32,8 @@
 using namespace PX4;
 
 static PX4I2CDriver i2cDriver;
-static Empty::EmptySPIDeviceManager spiDeviceManager;
-//static Empty::EmptyGPIO gpioDriver;
+static Empty::SPIDeviceManager spiDeviceManager;
+//static Empty::GPIO gpioDriver;
 
 static PX4Scheduler schedulerInstance;
 static PX4Storage storageDriver;
diff --git a/libraries/AP_HAL_PX4/I2CDriver.h b/libraries/AP_HAL_PX4/I2CDriver.h
index 458a4cc867..5c579d9b12 100644
--- a/libraries/AP_HAL_PX4/I2CDriver.h
+++ b/libraries/AP_HAL_PX4/I2CDriver.h
@@ -44,7 +44,7 @@ public:
 
 private:
     // we use an empty semaphore as the underlying I2C class already has a semaphore
-    Empty::EmptySemaphore semaphore;
+    Empty::Semaphore semaphore;
     PX4_I2C *px4_i2c = nullptr;
 };