projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new tag for the LUFA-120219-BETA release.
[pub/USBasp.git]
/
Demos
/
Device
/
ClassDriver
/
AudioInput
/
AudioInput.h
diff --git
a/Demos/Device/ClassDriver/AudioInput/AudioInput.h
b/Demos/Device/ClassDriver/AudioInput/AudioInput.h
index
741a091
..
8a6812c
100644
(file)
--- a/
Demos/Device/ClassDriver/AudioInput/AudioInput.h
+++ b/
Demos/Device/ClassDriver/AudioInput/AudioInput.h
@@
-1,13
+1,13
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
0
.
+ Copyright (C) Dean Camera, 201
2
.
dean [at] fourwalledcubicle [dot] com
dean [at] fourwalledcubicle [dot] com
- www.fourwalledcubicle.com
+ www.lufa-lib.org
*/
/*
*/
/*
- Copyright 201
0
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
2
Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
@@
-47,7
+47,6
@@
#include <LUFA/Drivers/Board/Buttons.h>
#include <LUFA/Drivers/Peripheral/ADC.h>
#include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Board/Buttons.h>
#include <LUFA/Drivers/Peripheral/ADC.h>
#include <LUFA/Drivers/USB/USB.h>
- #include <LUFA/Drivers/USB/Class/Audio.h>
#include "Descriptors.h"
#include "Descriptors.h"
@@
-58,7
+57,7
@@
/** ADC channel MUX mask for the microphone input. */
#define MIC_IN_ADC_MUX_MASK ADC_CHANNEL2
/** ADC channel MUX mask for the microphone input. */
#define MIC_IN_ADC_MUX_MASK ADC_CHANNEL2
- /** Maximum
ADC
sample value for the microphone input. */
+ /** Maximum
audio
sample value for the microphone input. */
#define SAMPLE_MAX_RANGE 0xFFFF
/** Maximum ADC range for the microphone input. */
#define SAMPLE_MAX_RANGE 0xFFFF
/** Maximum ADC range for the microphone input. */
@@
-78,12
+77,11
@@
/* Function Prototypes: */
void SetupHardware(void);
/* Function Prototypes: */
void SetupHardware(void);
- void ProcessNextSample(void);
void EVENT_USB_Device_Connect(void);
void EVENT_USB_Device_Disconnect(void);
void EVENT_USB_Device_ConfigurationChanged(void);
void EVENT_USB_Device_Connect(void);
void EVENT_USB_Device_Disconnect(void);
void EVENT_USB_Device_ConfigurationChanged(void);
- void EVENT_USB_Device_
Unhandled
ControlRequest(void);
+ void EVENT_USB_Device_ControlRequest(void);
#endif
#endif