Update to kernel release level 7

ev3dev · Sep 7, 2015 · 0896d81 · 0896d81
1 parent 840a660
commit 0896d81
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -7,14 +7,14 @@ KDIR ?= /lib/modules/$(KVER)/build
 export CONFIG_LEGO_DRIVERS = m
 export CONFIG_LEGO_PORTS = m
 export CONFIG_LEGOEV3_MOTORS = n
-export CONFIG_LEGOEV3_SERVO_MOTORS = m
-export CONFIG_LEGOEV3_DC_MOTORS = m
-export CONFIG_LEGOEV3_TACHO_MOTORS = m
-export CONFIG_LEGOEV3_MSENSORS = m
+export CONFIG_LEGO_SERVO_MOTORS = m
+export CONFIG_LEGO_DC_MOTORS = m
+export CONFIG_LEGO_TACHO_MOTORS = m
+export CONFIG_LEGO_SENSORS = m
 export CONFIG_NXT_ANALOG_SENSORS = m
 export CONFIG_EV3_ANALOG_SENSORS = m
 # I2C sensors require modifications to the core I2C kernel driver
-export CONFIG_LEGOEV3_I2C_SENSORS = n
+export CONFIG_NXT_I2C_SENSORS = n
 export CONFIG_EV3_UART_SENSORS = m
 export CONFIG_WEDO = m
 
@@ -29,23 +29,23 @@ endif
 ifeq ($(CONFIG_LEGOEV3_MOTORS), m)
 KBUILD_CFLAGS += -DCONFIG_LEGOEV3_MOTORS_MODULE
 endif
-ifeq ($(CONFIG_LEGOEV3_SERVO_MOTORS), m)
-KBUILD_CFLAGS += -DCONFIG_LEGOEV3_SERVO_MOTORS_MODULE
+ifeq ($(CONFIG_LEGO_SERVO_MOTORS), m)
+KBUILD_CFLAGS += -DCONFIG_LEGO_SERVO_MOTORS_MODULE
 endif
-ifeq ($(CONFIG_LEGOEV3_TACHO_MOTORS), m)
-KBUILD_CFLAGS += -DCONFIG_LEGOEV3_TACHO_MOTORS_MODULE
+ifeq ($(CONFIG_LEGO_TACHO_MOTORS), m)
+KBUILD_CFLAGS += -DCONFIG_LEGO_TACHO_MOTORS_MODULE
 endif
-ifeq ($(CONFIG_LEGOEV3_MSENSORS), m)
-KBUILD_CFLAGS += -DCONFIG_LEGOEV3_MSENSORS_MODULE
+ifeq ($(CONFIG_LEGO_SENSORS), m)
+KBUILD_CFLAGS += -DCONFIG_LEGO_SENSORS_MODULE
 endif
 ifeq ($(CONFIG_NXT_ANALOG_SENSORS), m)
 KBUILD_CFLAGS += -DCONFIG_NXT_ANALOG_SENSORS_MODULE
 endif
 ifeq ($(CONFIG_EV3_ANALOG_SENSORS), m)
 KBUILD_CFLAGS += -DCONFIG_EV3_ANALOG_SENSORS_MODULE
 endif
-ifeq ($(CONFIG_LEGOEV3_I2C_SENSORS), m)
-KBUILD_CFLAGS += -DCONFIG_LEGOEV3_I2C_SENSORS_MODULE
+ifeq ($(CONFIG_NXT_I2C_SENSORS), m)
+KBUILD_CFLAGS += -DCONFIG_NXT_I2C_SENSORS_MODULE
 endif
 ifeq ($(CONFIG_EV3_UART_SENSORS), m)
 KBUILD_CFLAGS += -DCONFIG_EV3_UART_SENSORS_MODULE

diff --git a/dkms.conf b/dkms.conf
@@ -1,4 +1,4 @@
-PACKAGE_VERSION="3.0.1"
+PACKAGE_VERSION="7.0"
 PACKAGE_NAME="lego-modules"
 CLEAN="make clean"
 MAKE[1]="make"

diff --git a/lego b/lego
+19 −18		Kconfig
+1 −0		Makefile
+9 −0		brickpi/Kconfig
+6 −0		brickpi/Makefile
+134 −0		brickpi/brickpi.h
+223 −0		brickpi/brickpi_i2c_sensor.c
+183 −0		brickpi/brickpi_internal.h
+683 −0		brickpi/brickpi_ld.c
+89 −0		brickpi/brickpi_motor.c
+398 −0		brickpi/brickpi_ports_in.c
+337 −0		brickpi/brickpi_ports_out.c
+4 −3		core/lego_port_class.c
+5 −0		ev3/legoev3_motor.h
+57 −78		ev3/legoev3_motor_core.c
+1 −1		ev3/legoev3_motor_defs.c
+1 −1		ev3/legoev3_ports_in.c
+24 −41		ev3/legoev3_ports_out.c
+72 −33		include/dc_motor_class.h
+6 −4		include/lego_port_class.h
+6 −4		include/lego_sensor_class.h
+21 −21		include/servo_motor_class.h
+30 −28		include/tacho_motor_class.h
+5 −5		motors/Makefile
+311 −112		motors/dc_motor_class.c
+9 −9		motors/rcx_led.c
+2 −5		motors/rcx_motor.c
+100 −90		motors/servo_motor_class.c
+25 −23		motors/tacho_motor_class.c
+3 −3		sensors/Makefile
+7 −3		sensors/ev3_analog_sensor_core.c
+1 −1		sensors/ev3_analog_sensor_defs.c
+25 −10		sensors/ev3_uart_sensor.h
+18 −8		sensors/ev3_uart_sensor_core.c
+16 −12		sensors/ev3_uart_sensor_defs.c
+22 −8		sensors/ev3_uart_sensor_ld.c
+15 −15		sensors/ht_nxt_smux.c
+30 −13		sensors/ht_nxt_smux_i2c_sensor.c
+44 −19		sensors/lego_sensor_class.c
+21 −21		sensors/ms_ev3_smux.c
+45 −48		sensors/ms_nxtmmx.c
+4 −3		sensors/nxt_analog_sensor_core.c
+13 −11		sensors/nxt_i2c_sensor.h
+115 −80		sensors/nxt_i2c_sensor_core.c
+173 −155		sensors/nxt_i2c_sensor_defs.c
+2 −2		wedo/Kconfig
+2 −3		wedo/wedo.h
+16 −35		wedo/wedo_motor.c
+10 −8		wedo/wedo_port.c