merged datalink814.

df_datalink_sp/build/makefile

@@ -12,6 +12,7 @@ RM := rm -rf
 # All of the sources participating in the build are defined here
 -include sources.mk
 -include src/util/subdir.mk
+-include src/time_ctrl/subdir.mk
 -include src/systembus/subdir.mk
 -include src/networking/phy_layer/subdir.mk
 -include src/networking/link_layer/geometry/subdir.mk
@@ -42,24 +43,24 @@ endif
 
 # Add inputs and outputs from these tool invocations to the build variables 
 ELFSIZE += \
-df_datalink.elf.size \
+df_datalink_sp.elf.size \
 
 
 # All Target
 all: pre-build main-build
 
 # Main-build Target
-main-build: df_datalink.elf secondary-outputs
+main-build: df_datalink_sp.elf secondary-outputs
 
 # Tool invocations
-df_datalink.elf: $(OBJS) ../src/lscript.ld $(USER_OBJS)
+df_datalink_sp.elf: $(OBJS) ../src/lscript.ld $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: ARM v7 gcc linker'
 	$(CC) -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard -Wl,-build-id=none -specs=Xilinx.spec -Wl,-T -Wl,../src/lscript.ld -L../bsp/ps7_cortexa9_0/lib -o "df_datalink.elf" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 
-df_datalink.elf.size: df_datalink.elf
+df_datalink_sp.elf.size: df_datalink_sp.elf
 	@echo 'Invoking: ARM v7 Print Size'
 	arm-none-eabi-size df_datalink.elf  |tee "df_datalink.elf.size"
 	@echo 'Finished building: $@'
@@ -67,7 +68,7 @@ df_datalink.elf.size: df_datalink.elf
 
 # Other Targets
 clean:
-	-$(RM) $(EXECUTABLES)$(OBJS)$(S_UPPER_DEPS)$(C_DEPS)$(ELFSIZE) df_datalink.elf
+	-$(RM) $(EXECUTABLES)$(OBJS)$(S_UPPER_DEPS)$(C_DEPS)$(ELFSIZE) df_datalink_sp.elf
 	-@echo ' '
 
 pre-build:

df_datalink_sp/build/sources.mk

@@ -30,5 +30,6 @@ src/networking/link_layer \
 src/networking/link_layer/geometry \
 src/networking/phy_layer \
 src/systembus \
+src/time_ctrl \
 src/util \
 

df_datalink_sp/build/src/networking/link_layer/subdir.mk

@@ -9,6 +9,7 @@ C_SRCS += \
 ../src/networking/link_layer/node_list.c \
 ../src/networking/link_layer/routine_table.c \
 ../src/networking/link_layer/scan.c \
+../src/networking/link_layer/schdevent.c \
 ../src/networking/link_layer/service.c \
 ../src/networking/link_layer/time_sync.c 
 
@@ -18,6 +19,7 @@ OBJS += \
 ./src/networking/link_layer/node_list.o \
 ./src/networking/link_layer/routine_table.o \
 ./src/networking/link_layer/scan.o \
+./src/networking/link_layer/schdevent.o \
 ./src/networking/link_layer/service.o \
 ./src/networking/link_layer/time_sync.o 
 
@@ -27,6 +29,7 @@ C_DEPS += \
 ./src/networking/link_layer/node_list.d \
 ./src/networking/link_layer/routine_table.d \
 ./src/networking/link_layer/scan.d \
+./src/networking/link_layer/schdevent.d \
 ./src/networking/link_layer/service.d \
 ./src/networking/link_layer/time_sync.d 
 

df_datalink_sp/build/src/time_ctrl/subdir.mk

@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../src/time_ctrl/time_ctrl.c 
+
+OBJS += \
+./src/time_ctrl/time_ctrl.o 
+
+C_DEPS += \
+./src/time_ctrl/time_ctrl.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+src/time_ctrl/%.o: ../src/time_ctrl/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: ARM v7 gcc compiler'
+	arm-none-eabi-gcc -Wall -O0 -g3 -I../bsp/ps7_cortexa9_0/include -I../src/include -c -fmessage-length=0 -MT"$@" -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+

df_datalink_sp/build/src/util/subdir.mk

@@ -5,6 +5,7 @@
 # Add inputs and outputs from these tool invocations to the build variables 
 C_SRCS += \
 ../src/util/circ_queue.c \
+../src/util/clist.c \
 ../src/util/common.c \
 ../src/util/crc.c \
 ../src/util/list.c \
@@ -12,6 +13,7 @@ C_SRCS += \
 
 OBJS += \
 ./src/util/circ_queue.o \
+./src/util/clist.o \
 ./src/util/common.o \
 ./src/util/crc.o \
 ./src/util/list.o \
@@ -19,6 +21,7 @@ OBJS += \
 
 C_DEPS += \
 ./src/util/circ_queue.d \
+./src/util/clist.d \
 ./src/util/common.d \
 ./src/util/crc.d \
 ./src/util/list.d \