Merge pull request #2811 from mcharleb/qurt_rebase_updates-3

Qurt rebase updates 3

src/modules/muorb/krait/uORBKraitFastRpcChannel.hpp

@@ -38,7 +38,7 @@
 #include <string>
 #include <pthread.h>
 #include "uORB/uORBCommunicator.hpp"
-#include <px4_muorb/px4muorb_KraitRpcWrapper.hpp>
+#include <px4muorb_KraitRpcWrapper.hpp>
 #include <map>
 #include "drivers/drv_hrt.h"
 

src/modules/simulator/simulator.cpp

@@ -150,10 +150,6 @@ static void usage()
 
 __BEGIN_DECLS
 extern int simulator_main(int argc, char *argv[]);
-extern void led_init(void);
-extern void led_on(int led);
-extern void led_off(int led);
-extern void led_toggle(int led);
 __END_DECLS
 
 extern "C" {
@@ -207,39 +203,3 @@ int simulator_main(int argc, char *argv[])
 }
 
 }
-
-bool static _led_state[2] = { false , false };
-
-__EXPORT void led_init()
-{
-	PX4_DEBUG("LED_INIT");
-}
-
-__EXPORT void led_on(int led)
-{
-	if (led == 1 || led == 0)
-	{
-		PX4_DEBUG("LED%d_ON", led);
-		_led_state[led] = true;
-	}
-}
-
-__EXPORT void led_off(int led)
-{
-	if (led == 1 || led == 0)
-	{
-		PX4_DEBUG("LED%d_OFF", led);
-		_led_state[led] = false;
-	}
-}
-
-__EXPORT void led_toggle(int led)
-{
-	if (led == 1 || led == 0)
-	{
-		_led_state[led] = !_led_state[led];
-		PX4_DEBUG("LED%d_TOGGLE: %s", led, _led_state[led] ? "ON" : "OFF");
-
-	}
-}
-

src/modules/uORB/uORB.cpp

@@ -284,7 +284,7 @@ int  orb_group_count(const struct orb_metadata *meta)
  *      priority, independent of the startup order of the associated publishers.
  * @return    OK on success, ERROR otherwise with errno set accordingly.
  */
-int  orb_priority(int handle, int *priority)
+int  orb_priority(int handle, int32_t *priority)
 {
 	return uORB::Manager::get_instance()->orb_priority(handle, priority);
 }

src/modules/uORB/uORBManager.hpp

@@ -269,7 +269,7 @@ public:
 	 *      priority, independent of the startup order of the associated publishers.
 	 * @return    OK on success, ERROR otherwise with errno set accordingly.
 	 */
-	int  orb_priority(int handle, int *priority) ;
+	int  orb_priority(int handle, int32_t *priority) ;
 
 	/**
 	 * Set the minimum interval between which updates are seen for a subscription.

src/modules/uORB/uORBManager_nuttx.cpp

@@ -166,7 +166,7 @@ int uORB::Manager::orb_stat(int handle, uint64_t *time)
 	return ioctl(handle, ORBIOCLASTUPDATE, (unsigned long)(uintptr_t)time);
 }
 
-int uORB::Manager::orb_priority(int handle, int *priority)
+int uORB::Manager::orb_priority(int handle, int32_t *priority)
 {
 	return ioctl(handle, ORBIOCGPRIORITY, (unsigned long)(uintptr_t)priority);
 }

src/modules/uORB/uORBManager_posix.cpp

@@ -172,7 +172,7 @@ int uORB::Manager::orb_stat(int handle, uint64_t *time)
 	return px4_ioctl(handle, ORBIOCLASTUPDATE, (unsigned long)(uintptr_t)time);
 }
 
-int uORB::Manager::orb_priority(int handle, int *priority)
+int uORB::Manager::orb_priority(int handle, int32_t *priority)
 {
 	return px4_ioctl(handle, ORBIOCGPRIORITY, (unsigned long)(uintptr_t)priority);
 }