Skip to content

Commit 14e4eba

Browse files
facchinmfacchinm
committed
Add ns_cmdline and blockdevice patches
1 parent 8d5510a commit 14e4eba

2 files changed

+92
-0
lines changed

‎patches/0102-mbed-client-cli-ns_cmdline-make-cmd_class_t-cmd-priv.patch

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 9e0cc1c9a636be2cafc5dfc5f5fd65526282eecc Mon Sep 17 00:00:00 2001
2+
From: Martino Facchin <[email protected]>
3+
Date: Wed, 22 Sep 2021 15:34:24 +0200
4+
Subject: [PATCH] mbed-client-cli: ns_cmdline: make cmd_class_t cmd private
5+
6+
---
7+
features/frameworks/mbed-client-cli/source/ns_cmdline.c | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/features/frameworks/mbed-client-cli/source/ns_cmdline.c b/features/frameworks/mbed-client-cli/source/ns_cmdline.c
11+
index 7e113502b6..1384e278ea 100644
12+
--- a/features/frameworks/mbed-client-cli/source/ns_cmdline.c
13+
+++ b/features/frameworks/mbed-client-cli/source/ns_cmdline.c
14+
@@ -355,7 +355,7 @@ typedef struct cmd_class_s {
15+
input_passthrough_func_t passthrough_fnc; // input passthrough cb function
16+
} cmd_class_t;
17+
18+
-cmd_class_t cmd = {
19+
+static cmd_class_t cmd = {
20+
.init = false,
21+
.cmd_ptr = NULL,
22+
.mutex_wait_fnc = NULL,
23+
--
24+
2.33.0
25+

‎patches/0103-BlockDevice-add-mbed-namespace-to-function-signature.patch

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
From b2a5aa2ca7d08f2e5a66c80ec0f7e1844840d694 Mon Sep 17 00:00:00 2001
2+
From: Martino Facchin <[email protected]>
3+
Date: Thu, 23 Sep 2021 15:16:10 +0200
4+
Subject: [PATCH] BlockDevice: add mbed namespace to function signatures
5+
6+
---
7+
.../COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h | 2 +-
8+
storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp | 2 +-
9+
.../blockdevice/COMPONENT_SPIF/include/SPIF/SPIFBlockDevice.h | 2 +-
10+
storage/blockdevice/COMPONENT_SPIF/source/SPIFBlockDevice.cpp | 2 +-
11+
4 files changed, 4 insertions(+), 4 deletions(-)
12+
13+
diff --git a/storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h b/storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h
14+
index 3ebd0e504c..2903ecad32 100644
15+
--- a/storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h
16+
+++ b/storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h
17+
@@ -315,7 +315,7 @@ private:
18+
/* SFDP Detection and Parsing Functions */
19+
/****************************************/
20+
// Parse and Detect required Basic Parameters from Table
21+
- int _sfdp_parse_basic_param_table(mbed::Callback<int(bd_addr_t, mbed::sfdp_cmd_addr_size_t, uint8_t, uint8_t, void *, bd_size_t)> sfdp_reader,
22+
+ int _sfdp_parse_basic_param_table(mbed::Callback<int(mbed::bd_addr_t, mbed::sfdp_cmd_addr_size_t, uint8_t, uint8_t, void *, mbed::bd_size_t)> sfdp_reader,
23+
mbed::sfdp_hdr_info &sfdp_info);
24+
25+
// Detect the soft reset protocol and reset - returns error if soft reset is not supported
26+
diff --git a/storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp b/storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp
27+
index 39b8c1c43c..898141f780 100644
28+
--- a/storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp
29+
+++ b/storage/blockdevice/COMPONENT_QSPIF/source/QSPIFBlockDevice.cpp
30+
@@ -617,7 +617,7 @@ int QSPIFBlockDevice::remove_csel_instance(PinName csel)
31+
/*********************************************************/
32+
/********** SFDP Parsing and Detection Functions *********/
33+
/*********************************************************/
34+
-int QSPIFBlockDevice::_sfdp_parse_basic_param_table(Callback<int(bd_addr_t, mbed::sfdp_cmd_addr_size_t, uint8_t, uint8_t, void *, bd_size_t)> sfdp_reader,
35+
+int QSPIFBlockDevice::_sfdp_parse_basic_param_table(Callback<int(mbed::bd_addr_t, mbed::sfdp_cmd_addr_size_t, uint8_t, uint8_t, void *, bd_size_t)> sfdp_reader,
36+
sfdp_hdr_info &sfdp_info)
37+
{
38+
uint8_t param_table[SFDP_BASIC_PARAMS_TBL_SIZE]; /* Up To 20 DWORDS = 80 Bytes */
39+
diff --git a/storage/blockdevice/COMPONENT_SPIF/include/SPIF/SPIFBlockDevice.h b/storage/blockdevice/COMPONENT_SPIF/include/SPIF/SPIFBlockDevice.h
40+
index a0a87ab78b..76adeacf46 100644
41+
--- a/storage/blockdevice/COMPONENT_SPIF/include/SPIF/SPIFBlockDevice.h
42+
+++ b/storage/blockdevice/COMPONENT_SPIF/include/SPIF/SPIFBlockDevice.h
43+
@@ -226,7 +226,7 @@ private:
44+
void *rx_buffer, mbed::bd_size_t rx_length);
45+
46+
// Parse and Detect required Basic Parameters from Table
47+
- int _sfdp_parse_basic_param_table(mbed::Callback<int(bd_addr_t, mbed::sfdp_cmd_addr_size_t, uint8_t, uint8_t, void *, bd_size_t)> sfdp_reader,
48+
+ int _sfdp_parse_basic_param_table(mbed::Callback<int(mbed::bd_addr_t, mbed::sfdp_cmd_addr_size_t, uint8_t, uint8_t, void *, mbed::bd_size_t)> sfdp_reader,
49+
mbed::sfdp_hdr_info &hdr_info);
50+
51+
// Detect fastest read Bus mode supported by device
52+
diff --git a/storage/blockdevice/COMPONENT_SPIF/source/SPIFBlockDevice.cpp b/storage/blockdevice/COMPONENT_SPIF/source/SPIFBlockDevice.cpp
53+
index bdbcae9e38..8b7e89b2d4 100644
54+
--- a/storage/blockdevice/COMPONENT_SPIF/source/SPIFBlockDevice.cpp
55+
+++ b/storage/blockdevice/COMPONENT_SPIF/source/SPIFBlockDevice.cpp
56+
@@ -607,7 +607,7 @@ spif_bd_error SPIFBlockDevice::_spi_send_general_command(int instruction, bd_add
57+
/*********************************************************/
58+
/********** SFDP Parsing and Detection Functions *********/
59+
/*********************************************************/
60+
-int SPIFBlockDevice::_sfdp_parse_basic_param_table(Callback<int(bd_addr_t, mbed::sfdp_cmd_addr_size_t, uint8_t, uint8_t, void *, bd_size_t)> sfdp_reader,
61+
+int SPIFBlockDevice::_sfdp_parse_basic_param_table(Callback<int(mbed::bd_addr_t, mbed::sfdp_cmd_addr_size_t, uint8_t, uint8_t, void *, mbed::bd_size_t)> sfdp_reader,
62+
sfdp_hdr_info &sfdp_info)
63+
{
64+
uint8_t param_table[SFDP_BASIC_PARAMS_TBL_SIZE]; /* Up To 20 DWORDS = 80 Bytes */
65+
--
66+
2.33.0
67+

0 commit comments

Comments
 (0)