From 16fea51e00a9e0968b9f216770a5ce1c847d3f55 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Tue, 3 Feb 2015 13:43:28 +0100 Subject: [PATCH] Driver headers: Move to 0-based indices --- src/drivers/drv_accel.h | 5 ++++- src/drivers/drv_adc.h | 2 +- src/drivers/drv_airspeed.h | 3 ++- src/drivers/drv_baro.h | 3 ++- src/drivers/drv_batt_smbus.h | 2 +- src/drivers/drv_blinkm.h | 2 +- src/drivers/drv_gps.h | 2 +- src/drivers/drv_gyro.h | 5 ++++- src/drivers/drv_led.h | 2 +- src/drivers/drv_mag.h | 6 ++++-- src/drivers/drv_mixer.h | 2 +- src/drivers/drv_pwm_output.h | 3 ++- src/drivers/drv_px4flow.h | 2 +- src/drivers/drv_range_finder.h | 3 ++- src/drivers/drv_rc_input.h | 2 +- src/drivers/drv_rgbled.h | 2 +- src/drivers/drv_sbus.h | 2 +- src/drivers/drv_tone_alarm.h | 2 +- 18 files changed, 31 insertions(+), 19 deletions(-) diff --git a/src/drivers/drv_accel.h b/src/drivers/drv_accel.h index 52e024c91e..fccd446ad0 100644 --- a/src/drivers/drv_accel.h +++ b/src/drivers/drv_accel.h @@ -46,7 +46,10 @@ #include "drv_sensor.h" #include "drv_orb_dev.h" -#define ACCEL_DEVICE_PATH "/dev/accel" +#define ACCEL_BASE_DEVICE_PATH "/dev/accel" +#define ACCEL0_DEVICE_PATH "/dev/accel0" +#define ACCEL1_DEVICE_PATH "/dev/accel1" +#define ACCEL2_DEVICE_PATH "/dev/accel2" /** * accel report structure. Reads from the device must be in multiples of this diff --git a/src/drivers/drv_adc.h b/src/drivers/drv_adc.h index 8ec6d1233f..f0ef739116 100644 --- a/src/drivers/drv_adc.h +++ b/src/drivers/drv_adc.h @@ -45,7 +45,7 @@ #include #include -#define ADC_DEVICE_PATH "/dev/adc0" +#define ADC0_DEVICE_PATH "/dev/adc0" /* * ioctl definitions diff --git a/src/drivers/drv_airspeed.h b/src/drivers/drv_airspeed.h index 78f31495d9..2ff91d5d00 100644 --- a/src/drivers/drv_airspeed.h +++ b/src/drivers/drv_airspeed.h @@ -48,7 +48,8 @@ #include "drv_sensor.h" #include "drv_orb_dev.h" -#define AIRSPEED_DEVICE_PATH "/dev/airspeed" +#define AIRSPEED_BASE_DEVICE_PATH "/dev/airspeed" +#define AIRSPEED0_DEVICE_PATH "/dev/airspeed0" /* * ioctl() definitions diff --git a/src/drivers/drv_baro.h b/src/drivers/drv_baro.h index 3d275d6198..65fb3a4cf4 100644 --- a/src/drivers/drv_baro.h +++ b/src/drivers/drv_baro.h @@ -46,7 +46,8 @@ #include "drv_sensor.h" #include "drv_orb_dev.h" -#define BARO_DEVICE_PATH "/dev/baro" +#define BARO_BASE_DEVICE_PATH "/dev/baro" +#define BARO0_DEVICE_PATH "/dev/baro0" /** * baro report structure. Reads from the device must be in multiples of this diff --git a/src/drivers/drv_batt_smbus.h b/src/drivers/drv_batt_smbus.h index ca130c84ee..f12e2bfb3a 100644 --- a/src/drivers/drv_batt_smbus.h +++ b/src/drivers/drv_batt_smbus.h @@ -44,4 +44,4 @@ #include "drv_orb_dev.h" /* device path */ -#define BATT_SMBUS_DEVICE_PATH "/dev/batt_smbus" +#define BATT_SMBUS0_DEVICE_PATH "/dev/batt_smbus0" diff --git a/src/drivers/drv_blinkm.h b/src/drivers/drv_blinkm.h index b757da5459..7258c9e841 100644 --- a/src/drivers/drv_blinkm.h +++ b/src/drivers/drv_blinkm.h @@ -45,7 +45,7 @@ #include #include -#define BLINKM_DEVICE_PATH "/dev/blinkm" +#define BLINKM0_DEVICE_PATH "/dev/blinkm0" /* * ioctl() definitions diff --git a/src/drivers/drv_gps.h b/src/drivers/drv_gps.h index 76a211000f..adb06cdb03 100644 --- a/src/drivers/drv_gps.h +++ b/src/drivers/drv_gps.h @@ -52,7 +52,7 @@ #define GPS_DEFAULT_UART_PORT "/dev/ttyS3" #endif -#define GPS_DEVICE_PATH "/dev/gps" +#define GPS0_DEVICE_PATH "/dev/gps0" typedef enum { GPS_DRIVER_MODE_NONE = 0, diff --git a/src/drivers/drv_gyro.h b/src/drivers/drv_gyro.h index 1f2bc35c4b..122d204159 100644 --- a/src/drivers/drv_gyro.h +++ b/src/drivers/drv_gyro.h @@ -46,7 +46,10 @@ #include "drv_sensor.h" #include "drv_orb_dev.h" -#define GYRO_DEVICE_PATH "/dev/gyro" +#define GYRO_BASE_DEVICE_PATH "/dev/gyro" +#define GYRO0_DEVICE_PATH "/dev/gyro0" +#define GYRO1_DEVICE_PATH "/dev/gyro1" +#define GYRO2_DEVICE_PATH "/dev/gyro2" /** * gyro report structure. Reads from the device must be in multiples of this diff --git a/src/drivers/drv_led.h b/src/drivers/drv_led.h index 4ce04696e0..f3e8164714 100644 --- a/src/drivers/drv_led.h +++ b/src/drivers/drv_led.h @@ -42,7 +42,7 @@ #include #include -#define LED_DEVICE_PATH "/dev/led" +#define LED0_DEVICE_PATH "/dev/led0" #define _LED_BASE 0x2800 diff --git a/src/drivers/drv_mag.h b/src/drivers/drv_mag.h index 193c816e0e..1d2a5df701 100644 --- a/src/drivers/drv_mag.h +++ b/src/drivers/drv_mag.h @@ -44,8 +44,10 @@ #include "drv_sensor.h" #include "drv_orb_dev.h" - -#define MAG_DEVICE_PATH "/dev/mag" +#define MAG_BASE_DEVICE_PATH "/dev/mag" +#define MAG0_DEVICE_PATH "/dev/mag0" +#define MAG1_DEVICE_PATH "/dev/mag0" +#define MAG2_DEVICE_PATH "/dev/mag0" /** * mag report structure. Reads from the device must be in multiples of this diff --git a/src/drivers/drv_mixer.h b/src/drivers/drv_mixer.h index 9f43015d91..a6cec3edc2 100644 --- a/src/drivers/drv_mixer.h +++ b/src/drivers/drv_mixer.h @@ -56,7 +56,7 @@ #include #include -#define MIXER_DEVICE_PATH "/dev/mixer" +#define MIXER0_DEVICE_PATH "/dev/mixer0" /* * ioctl() definitions diff --git a/src/drivers/drv_pwm_output.h b/src/drivers/drv_pwm_output.h index b10c3e18a9..743a4d5b31 100644 --- a/src/drivers/drv_pwm_output.h +++ b/src/drivers/drv_pwm_output.h @@ -57,7 +57,8 @@ __BEGIN_DECLS * PX4FMU with PX4IO connected) there may be other devices that * respond to this protocol. */ -#define PWM_OUTPUT_DEVICE_PATH "/dev/pwm_output" +#define PWM_OUTPUT_BASE_DEVICE_PATH "dev/pwm_output" +#define PWM_OUTPUT0_DEVICE_PATH "/dev/pwm_output0" /** * Maximum number of PWM output channels supported by the device. diff --git a/src/drivers/drv_px4flow.h b/src/drivers/drv_px4flow.h index 5aed3f02b0..63cfe9816a 100644 --- a/src/drivers/drv_px4flow.h +++ b/src/drivers/drv_px4flow.h @@ -44,7 +44,7 @@ #include "drv_sensor.h" #include "drv_orb_dev.h" -#define PX4FLOW_DEVICE_PATH "/dev/px4flow" +#define PX4FLOW0_DEVICE_PATH "/dev/px4flow0" /* * ObjDev tag for px4flow data. diff --git a/src/drivers/drv_range_finder.h b/src/drivers/drv_range_finder.h index 12d51aeaad..cc91569cd9 100644 --- a/src/drivers/drv_range_finder.h +++ b/src/drivers/drv_range_finder.h @@ -44,7 +44,8 @@ #include "drv_sensor.h" #include "drv_orb_dev.h" -#define RANGE_FINDER_DEVICE_PATH "/dev/range_finder" +#define RANGE_FINDER_BASE_DEVICE_PATH "/dev/range_finder" +#define RANGE_FINDER0_DEVICE_PATH "/dev/range_finder0" #define MB12XX_MAX_RANGEFINDERS 12 //Maximum number of RangeFinders that can be connected enum RANGE_FINDER_TYPE { diff --git a/src/drivers/drv_rc_input.h b/src/drivers/drv_rc_input.h index b249c2a093..d44728a712 100644 --- a/src/drivers/drv_rc_input.h +++ b/src/drivers/drv_rc_input.h @@ -55,7 +55,7 @@ * Input data may be obtained by subscribing to the input_rc * object, or by poll/reading from the device. */ -#define RC_INPUT_DEVICE_PATH "/dev/input_rc" +#define RC_INPUT0_DEVICE_PATH "/dev/input_rc0" /** * Maximum number of R/C input channels in the system. S.Bus has up to 18 channels. diff --git a/src/drivers/drv_rgbled.h b/src/drivers/drv_rgbled.h index 07c6186dde..b10caf56a1 100644 --- a/src/drivers/drv_rgbled.h +++ b/src/drivers/drv_rgbled.h @@ -43,7 +43,7 @@ #include /* more devices will be 1, 2, etc */ -#define RGBLED_DEVICE_PATH "/dev/rgbled0" +#define RGBLED0_DEVICE_PATH "/dev/rgbled0" /* * ioctl() definitions diff --git a/src/drivers/drv_sbus.h b/src/drivers/drv_sbus.h index 927c904ec2..4b07c64490 100644 --- a/src/drivers/drv_sbus.h +++ b/src/drivers/drv_sbus.h @@ -48,7 +48,7 @@ /** * Path for the default S.BUS device */ -#define SBUS_DEVICE_PATH "/dev/sbus" +#define SBUS0_DEVICE_PATH "/dev/sbus0" #define _SBUS_BASE 0x2c00 diff --git a/src/drivers/drv_tone_alarm.h b/src/drivers/drv_tone_alarm.h index 307f7dbc78..acfcecca19 100644 --- a/src/drivers/drv_tone_alarm.h +++ b/src/drivers/drv_tone_alarm.h @@ -62,7 +62,7 @@ #include -#define TONEALARM_DEVICE_PATH "/dev/tone_alarm" +#define TONEALARM0_DEVICE_PATH "/dev/tone_alarm0" #define _TONE_ALARM_BASE 0x7400 #define TONE_SET_ALARM _IOC(_TONE_ALARM_BASE, 1)