# HG changeset patch # User etisserant # Date 1171388311 -3600 # Node ID bdf4c86be6b21439fa408841ceb3aae8f2ce94b9 # Parent 16c8ceea8f188a18b6128f26af36c17400dbe12d Removed all non-supported and uncontrolled source code. Please refer to CVS version "Before_..." to see old code. diff -r 16c8ceea8f18 -r bdf4c86be6b2 drivers/can_virtual/Makefile.in --- a/drivers/can_virtual/Makefile.in Tue Feb 13 18:06:18 2007 +0100 +++ b/drivers/can_virtual/Makefile.in Tue Feb 13 18:38:31 2007 +0100 @@ -33,7 +33,6 @@ TARGET = SUB_TARGET CAN_DRIVER = SUB_CAN_DRIVER TIMERS_DRIVER = SUB_TIMERS_DRIVER -LED_ENABLE = SUB_LED_ENABLE INCLUDES = -I../../include -I../../include/$(TARGET) -I../../include/$(CAN_DRIVER) -I../../include/$(TIMERS_DRIVER) diff -r 16c8ceea8f18 -r bdf4c86be6b2 drivers/generic/Makefile.in --- a/drivers/generic/Makefile.in Tue Feb 13 18:06:18 2007 +0100 +++ b/drivers/generic/Makefile.in Tue Feb 13 18:38:31 2007 +0100 @@ -33,8 +33,6 @@ TARGET = SUB_TARGET CAN_DRIVER = SUB_CAN_DRIVER TIMERS_DRIVER = SUB_TIMERS_DRIVER -LED_DRIVER = SUB_LED_DRIVER -NVRAM_DRIVER = SUB_NVRAM_DRIVER INCLUDES = -I../../include -I../../include/$(SUB_TARGET) @@ -50,16 +48,6 @@ OBJS += ../$(CAN_DRIVER)/$(CAN_DRIVER).o endif -# add led driver if any -ifneq ($(LED_DRIVER),led_) -OBJS += ../$(LED_DRIVER)/$(LED_DRIVER).o -endif - -# add nvram driver if any -ifneq ($(NVRAM_DRIVER),nvram_) -OBJS += ../$(NVRAM_DRIVER)/$(NVRAM_DRIVER).o -endif - SRC_HFILES = ../../include/$(TARGET)/applicfg.h TARGET_HFILES = $(PREFIX)/include/$(TARGET)/applicfg.h diff -r 16c8ceea8f18 -r bdf4c86be6b2 drivers/unix/Makefile.in --- a/drivers/unix/Makefile.in Tue Feb 13 18:06:18 2007 +0100 +++ b/drivers/unix/Makefile.in Tue Feb 13 18:38:31 2007 +0100 @@ -33,8 +33,6 @@ TARGET = SUB_TARGET CAN_DRIVER = SUB_CAN_DRIVER TIMERS_DRIVER = SUB_TIMERS_DRIVER -LED_DRIVER = SUB_LED_DRIVER -NVRAM_DRIVER = SUB_NVRAM_DRIVER INCLUDES = -I../../include -I../../include/$(SUB_TARGET) diff -r 16c8ceea8f18 -r bdf4c86be6b2 examples/TestMasterSlave/Makefile.in --- a/examples/TestMasterSlave/Makefile.in Tue Feb 13 18:06:18 2007 +0100 +++ b/examples/TestMasterSlave/Makefile.in Tue Feb 13 18:38:31 2007 +0100 @@ -32,9 +32,8 @@ TARGET = SUB_TARGET CAN_DRIVER = SUB_CAN_DRIVER TIMERS_DRIVER = SUB_TIMERS_DRIVER -LED_ENABLE = SUB_LED_ENABLE -INCLUDES = -I../../include -I../../include/$(TARGET) -I../../include/$(CAN_DRIVER) -I../../include/$(TIMERS_DRIVER) -I../../include/$(LED_DRIVER) -I../../include/$(NVRAM_DRIVER) +INCLUDES = -I../../include -I../../include/$(TARGET) -I../../include/$(CAN_DRIVER) -I../../include/$(TIMERS_DRIVER) MASTER_OBJS = TestSlave.o TestMaster.o TestMasterSlave.o Slave.o Master.o diff -r 16c8ceea8f18 -r bdf4c86be6b2 src/states.c --- a/src/states.c Tue Feb 13 18:06:18 2007 +0100 +++ b/src/states.c Tue Feb 13 18:38:31 2007 +0100 @@ -25,12 +25,6 @@ #include "nmtSlave.h" -#ifdef LED_ENABLE -#include "led.h" -#else -#define led_set_state(a,b) -#endif - /* Prototypes for internals functions */ void switchCommunicationState(CO_Data* d, s_state_communication *newCommunicationState); @@ -76,13 +70,6 @@ { proceedNMTstateChange(d,m); } -#ifdef CANOPEN_LSS_ENABLE - default: - if (m->cob_id.w == 0x7E4 || m->cob_id.w == 0x705) - { - proceedLSS(d,m); - } -#endif } } @@ -161,8 +148,7 @@ default: return 0xFF; }/* end switch case */ - - led_set_state(d, newState); + } return 0; }