CPLD: Stop generating HackRF CPLD .hpp file.

This commit is contained in:
Jared Boone 2017-06-02 21:55:35 -07:00
parent 3d06941129
commit dd0c009e6f
3 changed files with 45 additions and 5 deletions

View File

@ -327,7 +327,7 @@ add_custom_command(
add_custom_command( add_custom_command(
OUTPUT ${HACKRF_CPLD_DATA_HPP} ${HACKRF_CPLD_DATA_CPP} OUTPUT ${HACKRF_CPLD_DATA_HPP} ${HACKRF_CPLD_DATA_CPP}
COMMAND ${EXTRACT_SVF_DATA_XC2C64A} ${HACKRF_CPLD_SVF_PATH} hackrf::one::cpld::verify_blocks ${HACKRF_CPLD_DATA_HPP} ${HACKRF_CPLD_DATA_CPP} COMMAND ${EXTRACT_SVF_DATA_XC2C64A} ${HACKRF_CPLD_SVF_PATH} hackrf::one::cpld::verify_blocks ${HACKRF_CPLD_DATA_CPP}
DEPENDS ${EXTRACT_SVF_DATA_XC2C64A} ${HACKRF_CPLD_SVF_PATH} DEPENDS ${EXTRACT_SVF_DATA_XC2C64A} ${HACKRF_CPLD_SVF_PATH}
) )

View File

@ -0,0 +1,39 @@
/*
* Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
*
* This file is part of PortaPack.
*
* 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 2, 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; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#ifndef __HACKRF_CPLD_DATA_H__
#define __HACKRF_CPLD_DATA_H__
#include "cpld_xilinx.hpp"
namespace hackrf {
namespace one {
namespace cpld {
using CPLD = ::cpld::xilinx::XC2C64A;
extern const CPLD::verify_blocks_t verify_blocks;
} /* namespace hackrf */
} /* namespace one */
} /* namespace cpld */
#endif/*__HACKRF_CPLD_DATA_H__*/

View File

@ -36,7 +36,7 @@ def crack_variable_path(variable_path):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('input_file_path', type=str) parser.add_argument('input_file_path', type=str)
parser.add_argument('variable_path', type=str) parser.add_argument('variable_path', type=str)
parser.add_argument('header_file_path', type=str) # parser.add_argument('header_file_path', type=str)
parser.add_argument('data_file_path', type=str) parser.add_argument('data_file_path', type=str)
args = parser.parse_args() args = parser.parse_args()
@ -330,12 +330,13 @@ for block in verify:
if block['id'] == 0x05: if block['id'] == 0x05:
block['tdo'] = program_done[0]['tdi'] block['tdo'] = program_done[0]['tdi']
header_file_name = os.path.split(args.header_file_path)[1] # header_file_name = os.path.split(args.header_file_path)[1]
header_file_name = 'hackrf_cpld_data.hpp'
header_includes = ('cpld_xilinx.hpp',) # header_includes = ('cpld_xilinx.hpp',)
data_includes = (header_file_name,) data_includes = (header_file_name,)
type_name = '::cpld::xilinx::XC2C64A::verify_blocks_t' type_name = '::cpld::xilinx::XC2C64A::verify_blocks_t'
HeaderGen(header_includes, namespaces, type_name, variable_name).to_file(args.header_file_path) # HeaderGen(header_includes, namespaces, type_name, variable_name).to_file(args.header_file_path)
DataGen(data_includes, namespaces, type_name, variable_name, verify).to_file(args.data_file_path) DataGen(data_includes, namespaces, type_name, variable_name, verify).to_file(args.data_file_path)