jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #161 from esden/compile_fixes

Browse Source 
Compile fixes
This commit is contained in:
Gareth McMullin 2016-10-19 15:12:41 -07:00 committed by GitHub
commit 39a0e26f4b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platforms/common/timing.h
View File

@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __TIMING__H #ifndef __TIMING_H
#define __TIMING_H #define __TIMING_H
struct platform_timeout { struct platform_timeout {
@ -26,5 +26,5 @@ struct platform_timeout {
uint32_t platform_time_ms(void); uint32_t platform_time_ms(void);
#endif #endif /* __TIMING_H */

4
src/platforms/stm32/usbdfu.h
View File

@ -17,6 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __USBDFU_H
#define __USBDFU_H
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
/* Commands sent with wBlockNum == 0 as per ST implementation. */ /* Commands sent with wBlockNum == 0 as per ST implementation. */
@ -44,3 +47,4 @@ void dfu_event(void);
/* Platform specific function */ /* Platform specific function */
void dfu_detach(void); void dfu_detach(void);
#endif /* __USBDFU_H */

2
src/target/adiv5.c
View File

@ -78,7 +78,7 @@ enum cid_class {
#ifdef PLATFORM_HAS_DEBUG #ifdef PLATFORM_HAS_DEBUG
/* The reserved ones only have an R in them, to save a bit of space. */ /* The reserved ones only have an R in them, to save a bit of space. */
static const char const *cidc_debug_strings[] = static const char * const cidc_debug_strings[] =
{ {
[cidc_gvc] = "Generic verification component", /* 0x0 */ [cidc_gvc] = "Generic verification component", /* 0x0 */
[cidc_romtab] = "ROM Table", /* 0x1 */ [cidc_romtab] = "ROM Table", /* 0x1 */