Skip to content

Commit 83f3eb1

Browse files
libdriverlibdriver
authored
Merge pull request #20 from libdriver/dev
fix: fix security register enumeration errors
2 parents 9776b0e + 0899db6 commit 83f3eb1

File tree

6 files changed

+42
-12
lines changed

6 files changed

+42
-12
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.0.1 (2024-07-21)
2+
3+
## Bug Fixes
4+
5+
- fix security register enumeration errors.
6+
17
## 1.0.0 (2021-07-15)
28

39
## Features

‎doc/html/driver__w25qxx_8h.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@
188188
}</td></tr>
189189
<tr class="memdesc:ga2fd3023819e1aebe089a4a72eb136da3"><td class="mdescLeft">&#160;</td><td class="mdescRight">w25qxx qspi read wrap length enumeration definition <a href="group__w25qxx__advance__driver.html#ga2fd3023819e1aebe089a4a72eb136da3">More...</a><br /></td></tr>
190190
<tr class="separator:ga2fd3023819e1aebe089a4a72eb136da3"><td class="memSeparator" colspan="2">&#160;</td></tr>
191-
<tr class="memitem:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">w25qxx_security_register_t</a> { <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x1000
192-
, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x2000
193-
, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x3000
191+
<tr class="memitem:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">w25qxx_security_register_t</a> { <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x10
192+
, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x20
193+
, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x30
194194
}</td></tr>
195195
<tr class="memdesc:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="mdescLeft">&#160;</td><td class="mdescRight">w25qxx security register enumeration definition <a href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">More...</a><br /></td></tr>
196196
<tr class="separator:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memSeparator" colspan="2">&#160;</td></tr>

‎doc/html/driver__w25qxx_8h_source.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@
147147
<div class="line"><a name="l00130"></a><span class="lineno"> 130</span>&#160; </div>
148148
<div class="line"><a name="l00134"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e"> 134</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div>
149149
<div class="line"><a name="l00135"></a><span class="lineno"> 135</span>&#160;{</div>
150-
<div class="line"><a name="l00136"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d"> 136</a></span>&#160; <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x1000, </div>
151-
<div class="line"><a name="l00137"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c"> 137</a></span>&#160; <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x2000, </div>
152-
<div class="line"><a name="l00138"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900"> 138</a></span>&#160; <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x3000, </div>
150+
<div class="line"><a name="l00136"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d"> 136</a></span>&#160; <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x10, </div>
151+
<div class="line"><a name="l00137"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c"> 137</a></span>&#160; <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x20, </div>
152+
<div class="line"><a name="l00138"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900"> 138</a></span>&#160; <a class="code" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x30, </div>
153153
<div class="line"><a name="l00139"></a><span class="lineno"> 139</span>&#160;} <a class="code" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">w25qxx_security_register_t</a>;</div>
154154
<div class="line"><a name="l00140"></a><span class="lineno"> 140</span>&#160; </div>
155155
<div class="line"><a name="l00144"></a><span class="lineno"><a class="line" href="group__w25qxx__advance__driver.html#ga94bbae2bf8906903e8dc2a28c490723d"> 144</a></span>&#160;<span class="keyword">typedef</span> <span class="keyword">enum</span></div>

‎doc/html/group__w25qxx__advance__driver.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@
111111
}</td></tr>
112112
<tr class="memdesc:ga2fd3023819e1aebe089a4a72eb136da3"><td class="mdescLeft">&#160;</td><td class="mdescRight">w25qxx qspi read wrap length enumeration definition <a href="group__w25qxx__advance__driver.html#ga2fd3023819e1aebe089a4a72eb136da3">More...</a><br /></td></tr>
113113
<tr class="separator:ga2fd3023819e1aebe089a4a72eb136da3"><td class="memSeparator" colspan="2">&#160;</td></tr>
114-
<tr class="memitem:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">w25qxx_security_register_t</a> { <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x1000
115-
, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x2000
116-
, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x3000
114+
<tr class="memitem:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memItemLeft" align="right" valign="top">enum &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">w25qxx_security_register_t</a> { <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7eaaf27484a497c13915c8acb0161cf137d">W25QXX_SECURITY_REGISTER_1</a> = 0x10
115+
, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea3353a88090850174ca163d56e4d7089c">W25QXX_SECURITY_REGISTER_2</a> = 0x20
116+
, <a class="el" href="group__w25qxx__advance__driver.html#gga81ddc7d4b9f4f124163beea19cc33c7ea65b73162d921075bed8cb8d848948900">W25QXX_SECURITY_REGISTER_3</a> = 0x30
117117
}</td></tr>
118118
<tr class="memdesc:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="mdescLeft">&#160;</td><td class="mdescRight">w25qxx security register enumeration definition <a href="group__w25qxx__advance__driver.html#ga81ddc7d4b9f4f124163beea19cc33c7e">More...</a><br /></td></tr>
119119
<tr class="separator:ga81ddc7d4b9f4f124163beea19cc33c7e"><td class="memSeparator" colspan="2">&#160;</td></tr>

‎doc/html/group__w25qxx__basic__driver.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,30 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga8e7a163b3d255b8c7fc035d
899899
</ul>
900900
</dd></dl>
901901
<dl class="section note"><dt>Note</dt><dd>none </dd></dl>
902+
<p>deinit</p>
903+
<p>deinit</p>
904+
<p>deinit</p>
905+
<p>deinit</p>
906+
<p>deinit</p>
907+
<p>deinit</p>
908+
<p>deinit</p>
909+
<p>deinit</p>
910+
<p>deinit</p>
911+
<p>deinit</p>
912+
<p>deinit</p>
913+
<p>deinit</p>
914+
<p>deinit</p>
915+
<p>deinit</p>
916+
<p>deinit</p>
917+
<p>deinit</p>
918+
<p>deinit</p>
919+
<p>deinit</p>
920+
<p>deinit</p>
921+
<p>deinit</p>
922+
<p>deinit</p>
923+
<p>deinit</p>
924+
<p>deinit</p>
925+
902926
<p class="definition">Definition at line <a class="el" href="driver__w25qxx_8c_source.html#l06819">6819</a> of file <a class="el" href="driver__w25qxx_8c_source.html">driver_w25qxx.c</a>.</p>
903927

904928
</div>

‎src/driver_w25qxx.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ typedef enum
133133
*/
134134
typedef enum
135135
{
136-
W25QXX_SECURITY_REGISTER_1 = 0x1000, /**< security register 1 */
137-
W25QXX_SECURITY_REGISTER_2 = 0x2000, /**< security register 2 */
138-
W25QXX_SECURITY_REGISTER_3 = 0x3000, /**< security register 3 */
136+
W25QXX_SECURITY_REGISTER_1 = 0x10, /**< security register 1 */
137+
W25QXX_SECURITY_REGISTER_2 = 0x20, /**< security register 2 */
138+
W25QXX_SECURITY_REGISTER_3 = 0x30, /**< security register 3 */
139139
} w25qxx_security_register_t;
140140

141141
/**

0 commit comments

Comments
 (0)