Skip to content

Commit 11bd966

Browse files
c1728p9c1728p9
committed
Remove inclusion of mbed.h from FPGA
And fix any build errors this caused.
1 parent b333212 commit 11bd966

File tree

4 files changed

+48
-39
lines changed

4 files changed

+48
-39
lines changed

‎components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/DynamicPinList.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#ifndef DYNAMIC_PIN_LIST_H
1919
#define DYNAMIC_PIN_LIST_H
2020

21-
#include "mbed.h"
2221
#include "pinmap.h"
2322
#include <vector>
2423

@@ -87,7 +86,7 @@ class DynamicPinList {
8786
int index(PinName pin) const;
8887

8988
private:
90-
vector<PinName> _pins;
89+
std::vector<PinName> _pins;
9190
};
9291

9392
#endif

‎components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.cpp

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
#include "MbedTester.h"
1919
#include "fpga_config.h"
2020
#include "BlockDevice.h"
21+
#include "platform/mbed_wait_api.h"
22+
#include "platform/mbed_error.h"
23+
#include "drivers/MbedCRC.h"
2124

2225
#define mbed_tester_printf(...)
2326

@@ -76,7 +79,7 @@ class MbedTesterBitMap {
7679
uint32_t _bitmap[(width + 31) / 32];
7780
};
7881

79-
static uint8_t spi_transfer(DigitalInOut *clk, DigitalInOut *mosi, DigitalInOut *miso, uint8_t data)
82+
static uint8_t spi_transfer(mbed::DigitalInOut *clk, mbed::DigitalInOut *mosi, mbed::DigitalInOut *miso, uint8_t data)
8083
{
8184
uint8_t ret = 0;
8285
for (int i = 0; i < 8; i++) {
@@ -90,7 +93,7 @@ static uint8_t spi_transfer(DigitalInOut *clk, DigitalInOut *mosi, DigitalInOut
9093
return ret;
9194
}
9295

93-
static void mbed_tester_command(DigitalInOut *clk, DigitalInOut *mosi, DigitalInOut *miso, uint8_t miso_index, uint32_t addr, bool write_n_read, uint8_t *data, uint8_t size)
96+
static void mbed_tester_command(mbed::DigitalInOut *clk, mbed::DigitalInOut *mosi, mbed::DigitalInOut *miso, uint8_t miso_index, uint32_t addr, bool write_n_read, uint8_t *data, uint8_t size)
9497
{
9598
// 8 - Start Key
9699
for (uint32_t i = 0; i < sizeof(KEY); i++) {
@@ -126,7 +129,7 @@ static void mbed_tester_command(DigitalInOut *clk, DigitalInOut *mosi, DigitalIn
126129

127130
}
128131

129-
static bool mbed_tester_test(DigitalInOut *clk, DigitalInOut *mosi, DigitalInOut *miso, uint8_t miso_index)
132+
static bool mbed_tester_test(mbed::DigitalInOut *clk, mbed::DigitalInOut *mosi, mbed::DigitalInOut *miso, uint8_t miso_index)
130133
{
131134
uint8_t buf[4];
132135
memset(buf, 0, sizeof(buf));
@@ -138,7 +141,7 @@ static bool mbed_tester_test(DigitalInOut *clk, DigitalInOut *mosi, DigitalInOut
138141
class MbedTesterBlockDevice : public BlockDevice {
139142
public:
140143

141-
MbedTesterBlockDevice(DigitalInOut &mosi, DigitalInOut &miso, DigitalInOut &clk, DigitalInOut &cs, uint32_t frequency)
144+
MbedTesterBlockDevice(mbed::DigitalInOut &mosi, mbed::DigitalInOut &miso, mbed::DigitalInOut &clk, mbed::DigitalInOut &cs, uint32_t frequency)
142145
: _mosi(mosi), _miso(miso), _clk(clk), _cs(cs), _wait_ns(1000000000 / frequency / 2), _init(false) {
143146

144147
// Set initial values
@@ -430,10 +433,10 @@ class MbedTesterBlockDevice : public BlockDevice {
430433
wait_ns(_wait_ns);
431434
}
432435

433-
DigitalInOut &_mosi;
434-
DigitalInOut &_miso;
435-
DigitalInOut &_clk;
436-
DigitalInOut &_cs;
436+
mbed::DigitalInOut &_mosi;
437+
mbed::DigitalInOut &_miso;
438+
mbed::DigitalInOut &_clk;
439+
mbed::DigitalInOut &_cs;
437440
uint32_t _wait_ns;
438441
bool _init;
439442
};
@@ -636,12 +639,12 @@ void MbedTester::set_control_pins_manual(PinName clk, PinName mosi, PinName miso
636639
_control_valid = true;
637640
}
638641

639-
bool MbedTester::firmware_dump(FileHandle *dest, Callback<void(uint8_t)> progress)
642+
bool MbedTester::firmware_dump(mbed::FileHandle *dest, mbed::Callback<void(uint8_t)> progress)
640643
{
641644
_update_control_pins();
642645

643646
if (!progress) {
644-
progress = callback(dummy_progress);
647+
progress = mbed::callback(dummy_progress);
645648
}
646649

647650
// Mapping intentionally different from control channel to prevent
@@ -717,12 +720,12 @@ bool MbedTester::firmware_dump(FileHandle *dest, Callback<void(uint8_t)> progres
717720
return true;
718721
}
719722

720-
bool MbedTester::firmware_dump_all(FileHandle *dest, Callback<void(uint8_t)> progress)
723+
bool MbedTester::firmware_dump_all(mbed::FileHandle *dest, mbed::Callback<void(uint8_t)> progress)
721724
{
722725
_update_control_pins();
723726

724727
if (!progress) {
725-
progress = callback(dummy_progress);
728+
progress = mbed::callback(dummy_progress);
726729
}
727730

728731
// Mapping intentionally different from control channel to prevent
@@ -770,12 +773,12 @@ bool MbedTester::firmware_dump_all(FileHandle *dest, Callback<void(uint8_t)> pro
770773
return true;
771774
}
772775

773-
bool MbedTester::firmware_update(FileHandle *src, Callback<void(uint8_t)> progress)
776+
bool MbedTester::firmware_update(mbed::FileHandle *src, mbed::Callback<void(uint8_t)> progress)
774777
{
775778
_update_control_pins();
776779

777780
if (!progress) {
778-
progress = callback(dummy_progress);
781+
progress = mbed::callback(dummy_progress);
779782
}
780783

781784
// Mapping intentionally different from control channel to prevent
@@ -814,7 +817,7 @@ bool MbedTester::firmware_update(FileHandle *src, Callback<void(uint8_t)> progre
814817

815818
// Setup CRC calculation
816819
uint32_t crc;
817-
MbedCRC<POLY_32BIT_ANSI, 32> ct;
820+
mbed::MbedCRC<POLY_32BIT_ANSI, 32> ct;
818821
if (ct.compute_partial_start(&crc) != 0) {
819822
sys_pin_mode_disabled();
820823
return false;
@@ -1156,9 +1159,9 @@ int MbedTester::io_expander_i2c_read(uint8_t i2c_index, uint8_t dev_addr, uint8_
11561159
//sda_val = _aux_index
11571160
//scl_in = _mosi_index (PHYSICAL_NC)
11581161
//scl_val = _clk_index
1159-
DigitalInOut *sda_in = _miso;
1160-
DigitalInOut *sda_val = _aux;
1161-
DigitalInOut *scl_val = _clk;
1162+
mbed::DigitalInOut *sda_in = _miso;
1163+
mbed::DigitalInOut *sda_val = _aux;
1164+
mbed::DigitalInOut *scl_val = _clk;
11621165
sda_in->input();
11631166
sda_val->output();
11641167
*sda_val = 1;
@@ -1295,9 +1298,9 @@ int MbedTester::io_expander_i2c_write(uint8_t i2c_index, uint8_t dev_addr, uint8
12951298
//sda_val = _aux_index
12961299
//scl_in = _mosi_index (PHYSICAL_NC)
12971300
//scl_val = _clk_index
1298-
DigitalInOut *sda_in = _miso;
1299-
DigitalInOut *sda_val = _aux;
1300-
DigitalInOut *scl_val = _clk;
1301+
mbed::DigitalInOut *sda_in = _miso;
1302+
mbed::DigitalInOut *sda_val = _aux;
1303+
mbed::DigitalInOut *scl_val = _clk;
13011304
sda_in->input();
13021305
sda_val->output();
13031306
*sda_val = 1;
@@ -2205,15 +2208,15 @@ bool MbedTester::_find_control_indexes(PhysicalIndex &clk_out, PhysicalIndex &mo
22052208
// Free CLK and MOSI pins found. Mark them as unavailable
22062209
allowed.clear(clk_index);
22072210
allowed.clear(mosi_index);
2208-
DigitalInOut clk(_form_factor.get(clk_index), PIN_OUTPUT, ::PullNone, 0);
2209-
DigitalInOut mosi(_form_factor.get(mosi_index), PIN_OUTPUT, ::PullNone, 0);
2211+
mbed::DigitalInOut clk(_form_factor.get(clk_index), PIN_OUTPUT, ::PullNone, 0);
2212+
mbed::DigitalInOut mosi(_form_factor.get(mosi_index), PIN_OUTPUT, ::PullNone, 0);
22102213

22112214
for (uint8_t miso_index = 0; miso_index < max_pins; miso_index++) {
22122215
if (!allowed.get(miso_index)) {
22132216
continue;
22142217
}
22152218

2216-
DigitalInOut miso(_form_factor.get(miso_index));
2219+
mbed::DigitalInOut miso(_form_factor.get(miso_index));
22172220
if (!mbed_tester_test(&clk, &mosi, &miso, miso_index)) {
22182221
// Pin doesn't work
22192222
continue;
@@ -2225,7 +2228,7 @@ bool MbedTester::_find_control_indexes(PhysicalIndex &clk_out, PhysicalIndex &mo
22252228
continue;
22262229
}
22272230

2228-
DigitalInOut aux(_form_factor.get(aux_index));
2231+
mbed::DigitalInOut aux(_form_factor.get(aux_index));
22292232
if (!mbed_tester_test(&clk, &mosi, &aux, aux_index)) {
22302233
// Pin doesn't work
22312234
continue;
@@ -2259,10 +2262,10 @@ bool MbedTester::_find_control_indexes(PhysicalIndex &clk_out, PhysicalIndex &mo
22592262

22602263
void MbedTester::_setup_control_pins()
22612264
{
2262-
_clk = new DigitalInOut(_form_factor.get(_clk_index), PIN_OUTPUT, ::PullNone, 0);
2263-
_mosi = new DigitalInOut(_form_factor.get(_mosi_index), PIN_OUTPUT, ::PullNone, 0);
2264-
_miso = new DigitalInOut(_form_factor.get(_miso_index));
2265-
_aux = new DigitalInOut(_form_factor.get(_aux_index));
2265+
_clk = new mbed::DigitalInOut(_form_factor.get(_clk_index), PIN_OUTPUT, ::PullNone, 0);
2266+
_mosi = new mbed::DigitalInOut(_form_factor.get(_mosi_index), PIN_OUTPUT, ::PullNone, 0);
2267+
_miso = new mbed::DigitalInOut(_form_factor.get(_miso_index));
2268+
_aux = new mbed::DigitalInOut(_form_factor.get(_aux_index));
22662269
}
22672270

22682271
void MbedTester::_free_control_pins()

‎components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.h

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
#ifndef MBED_TESTER_H
1919
#define MBED_TESTER_H
2020

21-
#include "mbed.h"
2221
#include "DynamicPinList.h"
22+
#include "platform/FileHandle.h"
23+
#include "platform/Callback.h"
24+
#include "drivers/DigitalInOut.h"
2325

2426
class MbedTester {
2527
public:
@@ -156,7 +158,7 @@ class MbedTester {
156158
* @param progress Optional progress callback called when the percent complete changes
157159
* @return true if firmware was successfully read, false otherwise
158160
*/
159-
bool firmware_dump(FileHandle *dest, Callback<void(uint8_t)> progress = Callback<void(uint8_t)>());
161+
bool firmware_dump(mbed::FileHandle *dest, mbed::Callback<void(uint8_t)> progress = mbed::Callback<void(uint8_t)>());
160162

161163
/**
162164
* Read FPGA CI Test Shield flash
@@ -168,7 +170,7 @@ class MbedTester {
168170
* @param progress Optional progress callback called when the percent complete changes
169171
* @return true if firmware was successfully read, false otherwise
170172
*/
171-
bool firmware_dump_all(FileHandle *dest, Callback<void(uint8_t)> progress = Callback<void(uint8_t)>());
173+
bool firmware_dump_all(mbed::FileHandle *dest, mbed::Callback<void(uint8_t)> progress = mbed::Callback<void(uint8_t)>());
172174

173175
/**
174176
* Program new FPGA CI Test Shield firmware
@@ -184,7 +186,7 @@ class MbedTester {
184186
* @param progress Optional progress callback called when the percent complete changes
185187
* @return true if firmware was successfully applied, false otherwise
186188
*/
187-
bool firmware_update(FileHandle *src, Callback<void(uint8_t)> progress = Callback<void(uint8_t)>());
189+
bool firmware_update(mbed::FileHandle *src, mbed::Callback<void(uint8_t)> progress = mbed::Callback<void(uint8_t)>());
188190

189191
/**
190192
* Map a physical pin to the given logical pin
@@ -864,10 +866,10 @@ class MbedTester {
864866
PhysicalIndex _mosi_index;
865867
PhysicalIndex _miso_index;
866868
PhysicalIndex _aux_index;
867-
DigitalInOut *_clk;
868-
DigitalInOut *_mosi;
869-
DigitalInOut *_miso;
870-
DigitalInOut *_aux;
869+
mbed::DigitalInOut *_clk;
870+
mbed::DigitalInOut *_mosi;
871+
mbed::DigitalInOut *_miso;
872+
mbed::DigitalInOut *_aux;
871873
/*
872874
* Used to reset IO expander chips only once the first time
873875
* any IO expander is accessed as well as during an io_exp_test

‎components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/test_utils.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ class DefaultFormFactor {
383383
};
384384

385385
#if DEVICE_SPI
386+
#include "spi_api.h"
386387
struct SPIMaps {
387388
static const PinMap *maps[];
388389
static const char *const pin_type_names[];
@@ -415,6 +416,7 @@ typedef Port<4, SPISlaveMaps, DefaultFormFactor, TF4> SPISlavePort;
415416
#endif
416417

417418
#if DEVICE_I2C
419+
#include "i2c_api.h"
418420
struct I2CMaps {
419421
static const PinMap *maps[];
420422
static const char *const pin_type_names[];
@@ -427,6 +429,7 @@ typedef Port<2, I2CMaps, DefaultFormFactor, TF2> I2CPort;
427429
#endif
428430

429431
#if DEVICE_PWMOUT
432+
#include "pwmout_api.h"
430433
struct PWMMaps {
431434
static const PinMap *maps[];
432435
static const char *const pin_type_names[];
@@ -439,6 +442,7 @@ typedef Port<1, PWMMaps, DefaultFormFactor, TF1> PWMPort;
439442
#endif
440443

441444
#if DEVICE_ANALOGIN
445+
#include "analogin_api.h"
442446
struct AnaloginMaps {
443447
static const PinMap *maps[];
444448
static const char *const pin_type_names[];
@@ -451,6 +455,7 @@ typedef Port<1, AnaloginMaps, DefaultFormFactor, TF1> AnaloginPort;
451455
#endif
452456

453457
#if DEVICE_ANALOGOUT
458+
#include "analogout_api.h"
454459
struct AnalogoutMaps {
455460
static const PinMap *maps[];
456461
static const char *const pin_type_names[];

0 commit comments

Comments
 (0)