sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed target header files containing a single prototype. 

Target probe prototypes are all in target.h now.
This commit is contained in:
Gareth McMullin 2012-06-18 20:27:06 +12:00
parent bc5a6f022b
commit bc7e7d2112
10 changed files with 13 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/adiv5.c
View File

@ -36,8 +36,6 @@
#include "target.h" #include "target.h"
#include "cortexm.h"
#ifndef DO_RESET_SEQ #ifndef DO_RESET_SEQ
#define DO_RESET_SEQ 0 #define DO_RESET_SEQ 0
#endif #endif

10
src/cortexm.c
View File

@ -36,14 +36,12 @@
#include "adiv5.h" #include "adiv5.h"
#include "target.h" #include "target.h"
#include "cortexm.h"
#include "lmi.h"
#include "stm32.h"
#include "nxp_tgt.h"
#include "sam3u.h"
static char cortexm_driver_str[] = "ARM Cortex-M3"; static char cortexm_driver_str[] = "ARM Cortex-M3";
/* target options recognised by the Cortex-M target */
#define TOPT_FLAVOUR_V6M (1<<0) /* if not set, target is assumed to be v7m */
#define TOPT_FLAVOUR_V7MF (1<<1) /* if set, floating-point enabled. */
/* Private peripheral bus base address */ /* Private peripheral bus base address */
#define CORTEXM_PPB_BASE 0xE0000000 #define CORTEXM_PPB_BASE 0xE0000000

33
src/include/cortexm.h
View File

@ -1,33 +0,0 @@
/*
* This file is part of the Black Magic Debug project.
*
* Copyright (C) 2011 Black Sphere Technologies Ltd.
* Written by Gareth McMullin <gareth@blacksphere.co.nz>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CORTEXM_H
#define __CORTEXM_H
#include "target.h"
/* target options recognised by the Cortex-M target */
#define TOPT_FLAVOUR_V6M (1<<0) /* if not set, target is assumed to be v7m */
#define TOPT_FLAVOUR_V7MF (1<<1) /* if set, floating-point enabled. */
int cortexm_probe(struct target_s *target);
#endif

29
src/include/lmi.h
View File

@ -1,29 +0,0 @@
/*
* This file is part of the Black Magic Debug project.
*
* Copyright (C) 2011 Black Sphere Technologies Ltd.
* Written by Gareth McMullin <gareth@blacksphere.co.nz>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __LMI_H
#define __LMI_H
#include "target.h"
int lmi_probe(struct target_s *target);
#endif

28
src/include/nxp_tgt.h
View File

@ -1,28 +0,0 @@
/*
* This file is part of the Black Magic Debug project.
*
* Copyright (C) 2011 Black Sphere Technologies Ltd.
* Written by Gareth McMullin <gareth@blacksphere.co.nz>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __NXP_TGT_H
#define __NXP_TGT_H
#include "target.h"
int lpc11xx_probe(struct target_s *target);
#endif

30
src/include/stm32.h
View File

@ -1,30 +0,0 @@
/*
* This file is part of the Black Magic Debug project.
*
* Copyright (C) 2011 Black Sphere Technologies Ltd.
* Written by Gareth McMullin <gareth@blacksphere.co.nz>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __STM32_H
#define __STM32_H
#include "target.h"
int stm32f1_probe(struct target_s *target);
int stm32f4_probe(struct target_s *target);
#endif

9
src/include/target.h
View File

@ -176,5 +176,14 @@ typedef struct target_s {
extern target *target_list, *cur_target, *last_target; extern target *target_list, *cur_target, *last_target;
/* Probe for various targets.
* Actual functions implemented in their respective drivers.
*/
int cortexm_probe(struct target_s *target);
int stm32f1_probe(struct target_s *target);
int stm32f4_probe(struct target_s *target);
int lmi_probe(struct target_s *target);
int lpc11xx_probe(struct target_s *target);
#endif #endif

1
src/nxp_tgt.c
View File

@ -6,7 +6,6 @@
#include "general.h" #include "general.h"
#include "adiv5.h" #include "adiv5.h"
#include "target.h" #include "target.h"
#include "nxp_tgt.h"
#define IAP_PGM_CHUNKSIZE 256 /* should fit in RAM on any device */ #define IAP_PGM_CHUNKSIZE 256 /* should fit in RAM on any device */

1
src/stm32f1.c
View File

@ -35,7 +35,6 @@
#include "general.h" #include "general.h"
#include "adiv5.h" #include "adiv5.h"
#include "target.h" #include "target.h"
#include "stm32.h"
static int stm32md_flash_erase(struct target_s *target, uint32_t addr, int len); static int stm32md_flash_erase(struct target_s *target, uint32_t addr, int len);
static int stm32hd_flash_erase(struct target_s *target, uint32_t addr, int len); static int stm32hd_flash_erase(struct target_s *target, uint32_t addr, int len);

1
src/stm32f4.c
View File

@ -36,7 +36,6 @@
#include "general.h" #include "general.h"
#include "adiv5.h" #include "adiv5.h"
#include "target.h" #include "target.h"
#include "stm32.h"
static int stm32f4_flash_erase(struct target_s *target, uint32_t addr, int len); static int stm32f4_flash_erase(struct target_s *target, uint32_t addr, int len);
static int stm32f4_flash_write_words(struct target_s *target, uint32_t dest, const uint32_t *src, static int stm32f4_flash_write_words(struct target_s *target, uint32_t dest, const uint32_t *src,