diff options
author | ymherklotz <ymherklotz@gmail.com> | 2018-02-15 12:04:58 +0000 |
---|---|---|
committer | ymherklotz <ymherklotz@gmail.com> | 2018-02-15 12:04:58 +0000 |
commit | f7552f668de19e0341ac94bbc9c1ee7f502c230f (patch) | |
tree | 3d7c3f0548c65665ebc1eb0d2000599f8c7f689f /lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b | |
parent | c2cea2844c962f349673e488183e6606b0a76e7b (diff) | |
download | NoiseSilencer-f7552f668de19e0341ac94bbc9c1ee7f502c230f.tar.gz NoiseSilencer-f7552f668de19e0341ac94bbc9c1ee7f502c230f.zip |
removing .metadata
Diffstat (limited to 'lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b')
4 files changed, 0 insertions, 373 deletions
diff --git a/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/80bc8150dd0100181ce89bcacea45786 b/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/80bc8150dd0100181ce89bcacea45786 deleted file mode 100644 index 5c1d8c8..0000000 --- a/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/80bc8150dd0100181ce89bcacea45786 +++ /dev/null @@ -1,91 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -C_SRCS += \ -../intio.c - -TCF_SRCS += \ -../dsp_bios_.tcf - -GEN_SRCS += \ -./dsp_bios_cfg.cmd \ -./dsp_bios_cfg.s?? \ -./dsp_bios_cfg_c.c - -GEN_CMDS += \ -./dsp_bios_cfg.cmd - -OBJS += \ -./dsp_bios_cfg.obj \ -./dsp_bios_cfg_c.obj \ -./intio.obj - -S??_DEPS += \ -./dsp_bios_cfg.pp - -C_DEPS += \ -./dsp_bios_cfg_c.pp \ -./intio.pp - -OBJS__QTD += \ -".\dsp_bios_cfg.obj" \ -".\dsp_bios_cfg_c.obj" \ -".\intio.obj" - -S??_DEPS__QTD += \ -".\dsp_bios_cfg.pp" - -GEN_SRCS__QTD += \ -".\dsp_bios_cfg.cmd" \ -".\dsp_bios_cfg.s??" \ -".\dsp_bios_cfg_c.c" - -C_DEPS__QTD += \ -".\dsp_bios_cfg_c.pp" \ -".\intio.pp" - -TCF_SRCS_QUOTED += \ -"../dsp_bios_.tcf" - -GEN_CMDS_QUOTED += \ --l"./dsp_bios_cfg.cmd" - -C_SRCS_QUOTED += \ -"../intio.c" - - -# Each subdirectory must supply rules for building sources it contributes -dsp_bios_cfg.cmd: ../dsp_bios_.tcf - @echo 'Building file: $<' - @echo 'Invoking: TConf Script Compiler' - "C:/EEE/CCStudio4.1/xdctools_3_16_02_32/tconf" -b -Dconfig.importPath="C:/EEE/CCStudio4.1/bios_5_41_02_14/packages;" "$<" - @echo 'Finished building: $<' - @echo ' ' - -dsp_bios_cfg.s??: dsp_bios_cfg.cmd -dsp_bios_cfg_c.c: dsp_bios_cfg.cmd - -dsp_bios_cfg.obj: ./dsp_bios_cfg.s?? $(GEN_OPTS) - @echo 'Building file: $<' - @echo 'Invoking: Compiler' - "C:/EEE/CCStudio4.1/ccsv4/tools/compiler/c6000/bin/cl6x" -mv6700 -g --define=_DEBUG --define=CHIP_6713 --include_path="C:/EEE/CCStudio4.1/ccsv4/tools/compiler/c6000/include" --include_path="C:/EEE/CCStudio4.1/ccsv4/C6000/dsk6713/include" --include_path="C:/EEE/CCStudio4.1/ccsv4/C6000/csl/include" --include_path="C:/GIT/RTDSP/lab4/RTDSP/Debug" --include_path="C:/EEE/CCStudio4.1/bios_5_41_02_14/packages/ti/bios/include" --include_path="C:/EEE/CCStudio4.1/bios_5_41_02_14/packages/ti/rtdx/include/c6000" --diag_warning=225 --preproc_with_compile --preproc_dependency="dsp_bios_cfg.pp" $(GEN_OPTS_QUOTED) $(subst #,$(wildcard $(subst $(SPACE),\$(SPACE),$<)),"#") - @echo 'Finished building: $<' - @echo ' ' - -dsp_bios_cfg_c.obj: ./dsp_bios_cfg_c.c $(GEN_OPTS) - @echo 'Building file: $<' - @echo 'Invoking: Compiler' - "C:/EEE/CCStudio4.1/ccsv4/tools/compiler/c6000/bin/cl6x" -mv6700 -g --define=_DEBUG --define=CHIP_6713 --include_path="C:/EEE/CCStudio4.1/ccsv4/tools/compiler/c6000/include" --include_path="C:/EEE/CCStudio4.1/ccsv4/C6000/dsk6713/include" --include_path="C:/EEE/CCStudio4.1/ccsv4/C6000/csl/include" --include_path="C:/GIT/RTDSP/lab4/RTDSP/Debug" --include_path="C:/EEE/CCStudio4.1/bios_5_41_02_14/packages/ti/bios/include" --include_path="C:/EEE/CCStudio4.1/bios_5_41_02_14/packages/ti/rtdx/include/c6000" --diag_warning=225 --preproc_with_compile --preproc_dependency="dsp_bios_cfg_c.pp" $(GEN_OPTS_QUOTED) $(subst #,$(wildcard $(subst $(SPACE),\$(SPACE),$<)),"#") - @echo 'Finished building: $<' - @echo ' ' - -intio.obj: ../intio.c $(GEN_OPTS) - @echo 'Building file: $<' - @echo 'Invoking: Compiler' - "C:/EEE/CCStudio4.1/ccsv4/tools/compiler/c6000/bin/cl6x" -mv6700 -g --define=_DEBUG --define=CHIP_6713 --include_path="C:/EEE/CCStudio4.1/ccsv4/tools/compiler/c6000/include" --include_path="C:/EEE/CCStudio4.1/ccsv4/C6000/dsk6713/include" --include_path="C:/EEE/CCStudio4.1/ccsv4/C6000/csl/include" --include_path="C:/GIT/RTDSP/lab4/RTDSP/Debug" --include_path="C:/EEE/CCStudio4.1/bios_5_41_02_14/packages/ti/bios/include" --include_path="C:/EEE/CCStudio4.1/bios_5_41_02_14/packages/ti/rtdx/include/c6000" --diag_warning=225 --preproc_with_compile --preproc_dependency="intio.pp" $(GEN_OPTS_QUOTED) $(subst #,$(wildcard $(subst $(SPACE),\$(SPACE),$<)),"#") - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/80f3b481dd0100181ce89bcacea45786 b/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/80f3b481dd0100181ce89bcacea45786 deleted file mode 100644 index 17ad43b..0000000 --- a/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/80f3b481dd0100181ce89bcacea45786 +++ /dev/null @@ -1,129 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -SHELL = cmd.exe - -EMPTY := -SPACE := $(EMPTY) $(EMPTY) - -ORDERED_OBJS += \ -$(GEN_CMDS_QUOTED) \ -"./intio.obj" \ -"./dsp_bios_cfg_c.obj" \ -"./dsp_bios_cfg.obj" \ --l"rts6700.lib" \ --l"C:/EEE/CCStudio4.1/ccsv4\C6000\csl\lib\csl6713.lib" \ --l"C:/EEE/CCStudio4.1/ccsv4\C6000\dsk6713\lib\dsk6713bslccsv4.lib" \ - --include ../makefile.init - -RM := DEL /F - -# All of the sources participating in the build are defined here --include sources.mk --include subdir.mk --include objects.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(S62_DEPS)),) --include $(S62_DEPS) -endif -ifneq ($(strip $(ASM_DEPS)),) --include $(ASM_DEPS) -endif -ifneq ($(strip $(C55_DEPS)),) --include $(C55_DEPS) -endif -ifneq ($(strip $(S_UPPER_DEPS)),) --include $(S_UPPER_DEPS) -endif -ifneq ($(strip $(C++_DEPS)),) --include $(C++_DEPS) -endif -ifneq ($(strip $(S_DEPS)),) --include $(S_DEPS) -endif -ifneq ($(strip $(CC_DEPS)),) --include $(CC_DEPS) -endif -ifneq ($(strip $(C64_DEPS)),) --include $(C64_DEPS) -endif -ifneq ($(strip $(CPP_DEPS)),) --include $(CPP_DEPS) -endif -ifneq ($(strip $(S64_DEPS)),) --include $(S64_DEPS) -endif -ifneq ($(strip $(CXX_DEPS)),) --include $(CXX_DEPS) -endif -ifneq ($(strip $(C67_DEPS)),) --include $(C67_DEPS) -endif -ifneq ($(strip $(S67_DEPS)),) --include $(S67_DEPS) -endif -ifneq ($(strip $(S43_DEPS)),) --include $(S43_DEPS) -endif -ifneq ($(strip $(C62_DEPS)),) --include $(C62_DEPS) -endif -ifneq ($(strip $(C43_DEPS)),) --include $(C43_DEPS) -endif -ifneq ($(strip $(C??_DEPS)),) --include $(C??_DEPS) -endif -ifneq ($(strip $(ASM_UPPER_DEPS)),) --include $(ASM_UPPER_DEPS) -endif -ifneq ($(strip $(OPT_DEPS)),) --include $(OPT_DEPS) -endif -ifneq ($(strip $(S??_DEPS)),) --include $(S??_DEPS) -endif -ifneq ($(strip $(S55_DEPS)),) --include $(S55_DEPS) -endif -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif -ifneq ($(strip $(SA_DEPS)),) --include $(SA_DEPS) -endif -ifneq ($(strip $(C_UPPER_DEPS)),) --include $(C_UPPER_DEPS) -endif -endif - --include ../makefile.defs - -# Add inputs and outputs from these tool invocations to the build variables - -# All Target -all: RTDSP.out - -# Tool invocations -RTDSP.out: $(GEN_CMDS) $(OBJS) - @echo 'Building target: $@' - @echo 'Invoking: Linker' - "C:/EEE/CCStudio4.1/ccsv4/tools/compiler/c6000/bin/cl6x" -mv6700 -g --define=_DEBUG --define=CHIP_6713 --diag_warning=225 -z -m"RTDSP.map" --warn_sections -i"C:/EEE/CCStudio4.1/ccsv4/tools/compiler/c6000/lib" -i"C:/EEE/CCStudio4.1/ccsv4/tools/compiler/c6000/include" -i"C:/EEE/CCStudio4.1/bios_5_41_02_14/packages/ti/rtdx/lib/c6000" -i"C:/EEE/CCStudio4.1/bios_5_41_02_14/packages/ti/bios/lib" --reread_libs --rom_model -o "RTDSP.out" $(ORDERED_OBJS) - @echo 'Finished building target: $@' - @echo ' ' - -# Other Targets -clean: - -$(RM) $(GEN_CMDS__QTD)$(GEN_SRCS__QTD)$(C6000_EXECUTABLE_OUTPUTS__QTD) "RTDSP.out" - -$(RM) ".\dsp_bios_cfg.obj" ".\dsp_bios_cfg_c.obj" ".\intio.obj" - -$(RM) ".\dsp_bios_cfg.pp" - -$(RM) ".\dsp_bios_cfg_c.pp" ".\intio.pp" - -@echo ' ' - -.PHONY: all clean dependents -.SECONDARY: - --include ../makefile.targets diff --git a/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/a0fbb2173f070018153483e962c7925e b/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/a0fbb2173f070018153483e962c7925e deleted file mode 100644 index e69de29..0000000 --- a/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/a0fbb2173f070018153483e962c7925e +++ /dev/null diff --git a/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/b0d781f041070018153483e962c7925e b/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/b0d781f041070018153483e962c7925e deleted file mode 100644 index 9d00a24..0000000 --- a/lab4/.metadata/.plugins/org.eclipse.core.resources/.history/5b/b0d781f041070018153483e962c7925e +++ /dev/null @@ -1,153 +0,0 @@ -/************************************************************************************* - DEPARTMENT OF ELECTRICAL AND ELECTRONIC ENGINEERING - IMPERIAL COLLEGE LONDON - - EE 3.19: Real Time Digital Signal Processing - Dr Paul Mitcheson and Daniel Harvey - - LAB 3: Interrupt I/O - - ********* I N T I O. C ********** - - Demonstrates inputing and outputing data from the DSK's audio port using interrupts. - - ************************************************************************************* - Updated for use on 6713 DSK by Danny Harvey: May-Aug 2006 - Updated for CCS V4 Sept 10 - ************************************************************************************/ -/* - * You should modify the code so that interrupts are used to service the - * audio port. - */ -/**************************** Pre-processor statements ******************************/ - -#include <stdlib.h> -// Included so program can make use of DSP/BIOS configuration tool. -#include "dsp_bios_cfg.h" - -/* The file dsk6713.h must be included in every program that uses the BSL. This - example also includes dsk6713_aic23.h because it uses the - AIC23 codec module (audio interface). */ -#include "dsk6713.h" -#include "dsk6713_aic23.h" - -// math library (trig functions) -#include <math.h> - -// Some functions to help with writing/reading the audio ports when using interrupts. -#include <helper_functions_ISR.h> -#include "Matlab/filter_coeff.txt" -// Some functions to help with configuring hardware -#include "helper_functions_polling.h" - - -// PI defined here for use in your code -#define PI 3.141592653589793 -#define N 249 -double buffer[N]= {0}; -unsigned int ptr = N-1; - -/******************************* Global declarations ********************************/ - -/* Audio port configuration settings: these values set registers in the AIC23 audio - interface to configure it. See TI doc SLWS106D 3-3 to 3-10 for more info. */ -DSK6713_AIC23_Config Config = { \ - /**********************************************************************/ - /* REGISTER FUNCTION SETTINGS */ - /**********************************************************************/\ - 0x0017, /* 0 LEFTINVOL Left line input channel volume 0dB */\ - 0x0017, /* 1 RIGHTINVOL Right line input channel volume 0dB */\ - 0x01f9, /* 2 LEFTHPVOL Left channel headphone volume 0dB */\ - 0x01f9, /* 3 RIGHTHPVOL Right channel headphone volume 0dB */\ - 0x0011, /* 4 ANAPATH Analog audio path control DAC on, Mic boost 20dB*/\ - 0x0000, /* 5 DIGPATH Digital audio path control All Filters off */\ - 0x0000, /* 6 DPOWERDOWN Power down control All Hardware on */\ - 0x0043, /* 7 DIGIF Digital audio interface format 16 bit */\ - 0x008d, /* 8 SAMPLERATE Sample rate control 8 KHZ */\ - 0x0001 /* 9 DIGACT Digital interface activation On */\ - /**********************************************************************/ -}; - - -// Codec handle:- a variable used to identify audio interface -DSK6713_AIC23_CodecHandle H_Codec; - - /******************************* Function prototypes ********************************/ -void init_hardware(void); -void init_HWI(void); -void ISR_AIC(void); -short non_circ_fir(void); -/********************************** Main routine ************************************/ -void main(){ - // initialize board and the audio port - init_hardware(); - - /* initialize hardware interrupts */ - init_HWI(); - - /* loop indefinitely, waiting for interrupts */ - while(1) {}; -} - -/********************************** init_hardware() **********************************/ -void init_hardware() -{ - // Initialize the board support library, must be called first - DSK6713_init(); - - // Start the AIC23 codec using the settings defined above in config - H_Codec = DSK6713_AIC23_openCodec(0, &Config); - - /* Function below sets the number of bits in word used by MSBSP (serial port) for - receives from AIC23 (audio port). We are using a 32 bit packet containing two - 16 bit numbers hence 32BIT is set for receive */ - MCBSP_FSETS(RCR1, RWDLEN1, 32BIT); - - /* Configures interrupt to activate on each consecutive available 32 bits - from Audio port hence an interrupt is generated for each L & R sample pair */ - MCBSP_FSETS(SPCR1, RINTM, FRM); - - /* These commands do the same thing as above but applied to data transfers to - the audio port */ - MCBSP_FSETS(XCR1, XWDLEN1, 32BIT); - MCBSP_FSETS(SPCR1, XINTM, FRM); -} - -/********************************** init_HWI() **************************************/ -void init_HWI() -{ - IRQ_globalDisable(); // Globally disables interrupts - IRQ_nmiEnable(); // Enables the NMI interrupt (used by the debugger) - IRQ_map(IRQ_EVT_RINT1,4); // Maps an event to a physical interrupt - IRQ_enable(IRQ_EVT_RINT1); // Enables the event - IRQ_globalEnable(); // Globally enables interrupts -} - -/******************** INTERRUPT SERVICE ROUTINE ***********************/ -void ISR_AIC() -{ - short sample_in, sample_out; - - sample_in = mono_read_16Bit(); - buffer[ptr] = (float) sample_in / 32767.f; - sample_out = non_circ_fir(); - mono_write_16Bit(sample_out); - - if (ptr == 0) - ptr = N; - ptr--; -} - -// Perform linear convolution -short non_circ_fir() -{ - - double y = 0; - int M, i; - M = sizeof(b) / sizeof(b[0]); - for(i = ptr; i < N+ptr; i++) { - y += buffer[i%N] * b[M-(i%N)-1]; - } - return y*32767; -} - |