首頁 探索 說明
註冊 登入
lqb
/
rt-thread
镜像来自 https://gitee.com/rtthread/rt-thread.git
1
0
複刻 0
檔案 問題管理 0 Wiki
瀏覽代碼

update STM32F10x_StdPeriph_Lib_V3.5.0

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1511 bbd45198-f89e-11dd-88c7-29a3b14d5316
wuyangyong 14 年之前
父節點
4f9638440a
當前提交
dc1079981b
共有 83 個文件被更改，包括 4100 次插入 和 1861 次删除
統一視圖 顯示文件統計
  1. 284 0
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
  2. 31 30
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s
  3. 31 30
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s
  4. 33 34
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s
  5. 29 28
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s
  6. 29 28
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s
  7. 29 28
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s
  8. 30 28
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s
  9. 31 30
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s
  10. 4 4
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s
  11. 4 4
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s
  12. 5 7
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s
  13. 4 4
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s
  14. 4 4
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s
  15. 4 4
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s
  16. 4 4
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s
  17. 4 4
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s
  18. 30 29
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s
  19. 31 30
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s
  20. 33 35
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s
  21. 29 28
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s
  22. 30 29
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s
  23. 29 28
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s
  24. 30 29
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s
  25. 31 30
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s
  26. 6 6
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s
  27. 6 6
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s
  28. 7 12
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s
  29. 6 6
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s
  30. 6 6
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s
  31. 6 6
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s
  32. 6 6
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s
  33. 6 6
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s
  34. 432 415
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h
  35. 1094 0
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
  36. 6 5
      bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
  37. 342 0
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html
  38. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h
  39. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h
  40. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h
  41. 206 92
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h
  42. 8 7
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h
  43. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h
  44. 8 7
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h
  45. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h
  46. 11 10
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h
  47. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h
  48. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h
  49. 8 7
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h
  50. 8 7
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h
  51. 23 9
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h
  52. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h
  53. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h
  54. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h
  55. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h
  56. 8 7
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h
  57. 8 7
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h
  58. 74 47
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h
  59. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h
  60. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h
  61. 11 9
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c
  62. 25 24
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c
  63. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c
  64. 461 217
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c
  65. 8 7
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c
  66. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
  67. 26 25
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c
  68. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c
  69. 56 53
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c
  70. 12 11
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c
  71. 33 32
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c
  72. 22 19
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c
  73. 12 9
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c
  74. 62 16
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c
  75. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c
  76. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c
  77. 9 8
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
  78. 12 11
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c
  79. 15 14
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c
  80. 19 18
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c
  81. 68 66
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c
  82. 28 25
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c
  83. 7 6
      bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c

+ 284 - 0
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
查看文件 

@@ -0,0 +1,284 @@
 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

+<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

+

+

+

+

+

+

+

+

+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

+<link rel="File-List" href="Library_files/filelist.xml">

+<link rel="Edit-Time-Data" href="Library_files/editdata.mso"><!--[if !mso]> <style> v\:* {behavior:url(#default#VML);} o\:* {behavior:url(#default#VML);} w\:* {behavior:url(#default#VML);} .shape {behavior:url(#default#VML);} </style> <![endif]--><title>Release Notes for STM32F10x CMSIS</title><!--[if gte mso 9]><xml> <o:DocumentProperties> <o:Author>STMicroelectronics</o:Author> <o:LastAuthor>STMicroelectronics</o:LastAuthor> <o:Revision>37</o:Revision> <o:TotalTime>136</o:TotalTime> <o:Created>2009-02-27T19:26:00Z</o:Created> <o:LastSaved>2009-03-01T17:56:00Z</o:LastSaved> <o:Pages>1</o:Pages> <o:Words>522</o:Words> <o:Characters>2977</o:Characters> <o:Company>STMicroelectronics</o:Company> <o:Lines>24</o:Lines> <o:Paragraphs>6</o:Paragraphs> <o:CharactersWithSpaces>3493</o:CharactersWithSpaces> <o:Version>11.6568</o:Version> </o:DocumentProperties> </xml><![endif]--><!--[if gte mso 9]><xml> <w:WordDocument> <w:Zoom>110</w:Zoom> <w:ValidateAgainstSchemas/> <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid> <w:IgnoreMixedContent>false</w:IgnoreMixedContent> <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText> <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel> </w:WordDocument> </xml><![endif]--><!--[if gte mso 9]><xml> <w:LatentStyles DefLockedState="false" LatentStyleCount="156"> </w:LatentStyles> </xml><![endif]-->

+

+

+

+<style>

+<!--

+/* Style Definitions */

+p.MsoNormal, li.MsoNormal, div.MsoNormal

+{mso-style-parent:"";

+margin:0in;

+margin-bottom:.0001pt;

+mso-pagination:widow-orphan;

+font-size:12.0pt;

+font-family:"Times New Roman";

+mso-fareast-font-family:"Times New Roman";}

+h2

+{mso-style-next:Normal;

+margin-top:12.0pt;

+margin-right:0in;

+margin-bottom:3.0pt;

+margin-left:0in;

+mso-pagination:widow-orphan;

+page-break-after:avoid;

+mso-outline-level:2;

+font-size:14.0pt;

+font-family:Arial;

+font-weight:bold;

+font-style:italic;}

+a:link, span.MsoHyperlink

+{color:blue;

+text-decoration:underline;

+text-underline:single;}

+a:visited, span.MsoHyperlinkFollowed

+{color:blue;

+text-decoration:underline;

+text-underline:single;}

+p

+{mso-margin-top-alt:auto;

+margin-right:0in;

+mso-margin-bottom-alt:auto;

+margin-left:0in;

+mso-pagination:widow-orphan;

+font-size:12.0pt;

+font-family:"Times New Roman";

+mso-fareast-font-family:"Times New Roman";}

+@page Section1

+{size:8.5in 11.0in;

+margin:1.0in 1.25in 1.0in 1.25in;

+mso-header-margin:.5in;

+mso-footer-margin:.5in;

+mso-paper-source:0;}

+div.Section1

+{page:Section1;}

+-->

+</style><!--[if gte mso 10]> <style> /* Style Definitions */ table.MsoNormalTable {mso-style-name:"Table Normal"; mso-tstyle-rowband-size:0; mso-tstyle-colband-size:0; mso-style-noshow:yes; mso-style-parent:""; mso-padding-alt:0in 5.4pt 0in 5.4pt; mso-para-margin:0in; mso-para-margin-bottom:.0001pt; mso-pagination:widow-orphan; font-size:10.0pt; font-family:"Times New Roman"; mso-ansi-language:#0400; mso-fareast-language:#0400; mso-bidi-language:#0400;} </style> <![endif]--><!--[if gte mso 9]><xml> <o:shapedefaults v:ext="edit" spidmax="5122"/> </xml><![endif]--><!--[if gte mso 9]><xml> <o:shapelayout v:ext="edit"> <o:idmap v:ext="edit" data="1"/> </o:shapelayout></xml><![endif]--></head>

+<body lang="EN-US" link="blue" vlink="blue">

+<div class="Section1">

+<p class="MsoNormal"><span style="font-family: Arial;"><o:p><br>

+</o:p></span></p>

+<div align="center">

+<table class="MsoNormalTable" style="width: 675pt;" border="0" cellpadding="0" cellspacing="0" width="900">

+<tbody>

+<tr style="">

+<td style="padding: 0cm;" valign="top">

+<table class="MsoNormalTable" style="width: 675pt;" border="0" cellpadding="0" cellspacing="0" width="900">

+<tbody>

+          <tr>

+            <td style="vertical-align: top;"><span style="font-size: 8pt; font-family: Arial; color: blue;"><a href="../../../../../../Release_Notes.html">Back to Release page</a></span></td>

+          </tr>

+<tr style="">

+<td style="padding: 1.5pt;">

+<h1 style="margin-bottom: 18pt; text-align: center;" align="center"><span style="font-size: 20pt; font-family: Verdana; color: rgb(51, 102, 255);">Release

+Notes for STM32F10x CMSIS</span><span style="font-size: 20pt; font-family: Verdana;"><o:p></o:p></span></h1>

+<p class="MsoNormal" style="text-align: center;" align="center"><span style="font-size: 10pt; font-family: Arial; color: black;">Copyright 2011 STMicroelectronics</span><span style="color: black;"><u1:p></u1:p><o:p></o:p></span></p>

+<p class="MsoNormal" style="text-align: center;" align="center"><span style="font-size: 10pt; font-family: Arial; color: black;"><img alt="" id="_x0000_i1025" src="../../../../../../_htmresc/logo.bmp" style="border: 0px solid ; width: 86px; height: 65px;"></span><span style="font-size: 10pt;"><o:p></o:p></span></p>

+</td>

+</tr>

+</tbody>

+</table>

+<p class="MsoNormal"><span style="font-family: Arial; display: none;"><o:p>&nbsp;</o:p></span></p>

+<table class="MsoNormalTable" style="width: 675pt;" border="0" cellpadding="0" width="900">

+<tbody>

+<tr>

+<td style="padding: 0cm;" valign="top">

+<h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><span style="font-size: 12pt; color: white;">Contents<o:p></o:p></span></h2>

+<ol style="margin-top: 0cm;" start="1" type="1">

+<li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;"><a href="#History">STM32F10x CMSIS

+update History</a><o:p></o:p></span></li>

+<li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;"><a href="#License">License</a><o:p></o:p></span></li>

+</ol>

+<span style="font-family: &quot;Times New Roman&quot;;"></span>

+<h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><a name="History"></a><span style="font-size: 12pt; color: white;">STM32F10x CMSIS

+update History</span></h2><br>

+            <h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; width: 167px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V3.5.0 / 11-March-2011<o:p></o:p></span></h3>

+            <p class="MsoNormal" style="margin: 4.5pt 0cm 4.5pt 18pt;"><b style=""><u><span style="font-size: 10pt; font-family: Verdana; color: black;">Main

+Changes<o:p></o:p></span></u></b></p>

+

+            <ul style="margin-top: 0cm;" type="square">

+<li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">stm32f10x.h

+</span>and <span style="font-style: italic;">startup_stm32f10x_hd_vl.s</span> files: remove the FSMC interrupt

+definition for STM32F10x High-density Value line devices.<br>

+</span></li>

+              <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">system_stm32f10x.c</span> file&nbsp;provided within the CMSIS folder. <br>

+</span></li>

+

+            </ul>

+

+            <h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 558.05pt;"><span style="font-size: 10pt; font-family: Arial; color: white;">3.4.0

+- 10/15/2010</span></h3>

+

+            <ol>

+<li><b><i><span style="font-size: 10pt; font-family: Verdana;">General</span></i></b></li>

+            </ol>

+

+            <ul style="margin-top: 0in;" type="disc">

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add support

+for&nbsp;<b>STM32F10x High-density Value line devices</b>.</span></li>

+            </ul>

+            <ol start="2">

+              <li><b><i><span style="font-size: 10pt; font-family: Verdana;">STM32F10x CMSIS Device Peripheral Access Layer </span></i></b></li>

+            </ol>

+

+

+            

+            <ul style="margin-top: 0in;" type="disc">

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="text-decoration: underline;">STM32F10x CMSIS Cortex-M3 Device Peripheral Access Layer Header File:</span> <span style="font-weight: bold; font-style: italic;">stm32f10x.h</span></span><br>

+              </li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Update to support High-density Value line devices</span><span style="font-size: 10pt; font-family: Verdana;"></span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add new define <span style="font-style: italic;">STM32F10X_HD_VL</span></span></li>

+                  <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">RCC, AFIO, FSMC bits definition updated</span></li>

+</ul>

+                <li class="MsoNormal" style="">

+

+                  <span style="font-size: 10pt; font-family: &quot;Verdana&quot;,&quot;sans-serif&quot;;">All

+STM32 devices definitions are commented by default. User has to select the

+appropriate device before starting else an error will be signaled on compile

+time.</span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: &quot;Verdana&quot;,&quot;sans-serif&quot;;">Add new IRQs definitons inside the IRQn_Type enumeration for STM23 High-density Value line devices.</span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: &quot;Verdana&quot;,&quot;sans-serif&quot;;">"<span style="font-weight: bold;">bool</span>" type removed.</span><br>

+                  <span style="font-size: 10pt; font-family: &quot;Verdana&quot;,&quot;sans-serif&quot;;"></span></li>

+</ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="text-decoration: underline;">STM32F10x CMSIS Cortex-M3 Device Peripheral Access Layer System Files:</span> <span style="font-weight: bold; font-style: italic;">system_stm32f10x.h and system_stm32f10x.c</span></span><br>

+                <span style="font-size: 10pt; font-family: Verdana;"></span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-weight: bold; font-style: italic;">"system_stm32f10x.c" </span><span style="font-weight: bold;"></span>moved to to "<span style="font-weight: bold; font-style: italic;">STM32F10x_StdPeriph_Template</span>" directory. This file is also moved to each example directory under "<span style="font-weight: bold; font-style: italic;">STM32F10x_StdPeriph_Examples</span>".</span><br>

+<span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;"></span></span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">SystemInit_ExtMemCtl() </span>function: update to support High-density Value line devices.</span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add "<span style="font-style: italic;">VECT_TAB_SRAM</span>" inside "</span><span style="font-size: 10pt; font-family: Verdana;"><span style="font-weight: bold; font-style: italic;">system_stm32f10x.c</span></span><span style="font-size: 10pt; font-family: Verdana;">"

+to select if the user want to place the Vector Table in internal SRAM.

+An additional define is also to specify the Vector Table offset "<span style="font-style: italic;">VECT_TAB_OFFSET</span>".<br>

+                  </span></li>

+

+              </ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="text-decoration: underline;">STM32F10x CMSIS startup files:</span></span><span style="font-size: 10pt; font-family: Verdana;"><span style="font-weight: bold; font-style: italic;">startup_stm32f10x_xx.s</span></span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add three

+startup files for STM32 High-density Value line devices:

+                  <span style="font-weight: bold; font-style: italic;">startup_stm32f10x_hd_vl.s</span></span></li></ul>

+            </ul>

+            <h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 558.05pt;"><span style="font-size: 10pt; font-family: Arial; color: white;">3.3.0

+- 04/16/2010</span></h3>

+

+<ol><li><b><i><span style="font-size: 10pt; font-family: Verdana;">General</span></i></b></li></ol>

+<ul style="margin-top: 0in;" type="disc"><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add support

+for&nbsp;<b>STM32F10x XL-density devices</b>.</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add startup files for TrueSTUDIO toolchain<br></span></li></ul><ol start="2"><li><b><i><span style="font-size: 10pt; font-family: Verdana;">STM32F10x CMSIS Device Peripheral Access Layer </span></i></b></li></ol>

+

+            <ul style="margin-top: 0in;" type="disc"><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="text-decoration: underline;">STM32F10x CMSIS Cortex-M3 Device Peripheral Access Layer Header File:</span> <span style="font-weight: bold; font-style: italic;">stm32f10x.h</span></span><br>

+              </li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Update to support XL-density devices</span><span style="font-size: 10pt; font-family: Verdana;"></span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add new define <span style="font-style: italic;">STM32F10X_XL</span></span></li></ul><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add new IRQs for&nbsp;</span><span style="font-size: 10pt; font-family: Verdana;">TIM9..14</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Update FLASH_TypeDef structure</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add new IP instances TIM9..14</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">RCC, AFIO, DBGMCU bits definition updated</span></li></ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Correct IRQs definition for MD-, LD-, MD_VL- and LD_VL-density devices&nbsp;(remove&nbsp;comma "," at the end of enum list)<br></span></li></ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="text-decoration: underline;">STM32F10x CMSIS Cortex-M3 Device Peripheral Access Layer System Files:</span> <span style="font-weight: bold; font-style: italic;">system_stm32f10x.h and system_stm32f10x.c</span></span><br>

+                <span style="font-size: 10pt; font-family: Verdana;"></span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">SystemInit_ExtMemCtl() </span>function: update to support XL-density devices</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">SystemInit()</span> function: swap the order of SetSysClock() and SystemInit_ExtMemCtl() functions.&nbsp;</span><span style="font-size: 10pt; font-family: Verdana;"><br>

+                  </span></li></ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="text-decoration: underline;">STM32F10x CMSIS startup files:</span><span style="font-weight: bold; font-style: italic;"></span><span style="font-style: italic;"><span style="font-weight: bold;"></span></span></span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">add three

+startup files for STM32 XL-density&nbsp;devices:

+                  <span style="font-weight: bold; font-style: italic;">startup_stm32f10x_xl.s</span></span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-weight: bold;">startup_stm32f10x_md_vl.s</span> for RIDE7: add USART3 IRQ&nbsp;Handler (was missing in&nbsp;previous version)</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add startup files for TrueSTUDIO toolchain</span></li></ul></ul><span style="font-size: 10pt; font-family: Verdana;"><span style="font-weight: bold; font-style: italic;"></span></span>

+<h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 558.05pt;"><span style="font-size: 10pt; font-family: Arial; color: white;">3.2.0

+- 03/01/2010</span></h3>

+<ol style="margin-top: 0in;" start="1" type="1">

+<li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">General</span></i></b><i><span style="font-size: 10pt; font-family: Verdana;"></span></i><i><span style="font-size: 10pt;"><o:p></o:p></span></i></li>

+</ol>

+<ul style="margin-top: 0in;" type="disc">

+

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">STM32F10x CMSIS files updated to <span style="font-weight: bold;">CMSIS V1.30</span> release</span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Directory structure updated to be aligned with CMSIS V1.30<br>

+                </span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add support

+for&nbsp;<b>STM32 Low-density Value line (STM32F100x4/6) and

+Medium-density Value line (STM32F100x8/B) devices</b>.&nbsp;</span><span style="font-size: 10pt;"><o:p></o:p></span></li>

+

+</ul>

+<ol style="margin-top: 0in;" start="2" type="1">

+<li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">CMSIS Core Peripheral Access Layer</span></i></b></li></ol>

+            <ul>

+              <li><b><i><span style="font-size: 10pt; font-family: Verdana;"></span></i></b><span style="font-size: 10pt; font-family: Verdana;"> Refer to <a href="../../../CMSIS_changes.htm" target="_blank">CMSIS changes</a></span></li>

+            </ul>

+            <ol style="margin-top: 0in; list-style-type: decimal;" start="3">

+              <li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">STM32F10x CMSIS Device Peripheral Access Layer </span></i></b><b><i><span style="font-size: 10pt;"><o:p></o:p></span></i></b></li>

+

+            </ol>

+

+            <ul style="margin-top: 0in;" type="disc">

+

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="text-decoration: underline;">STM32F10x CMSIS Cortex-M3 Device Peripheral Access Layer Header File:</span> <span style="font-weight: bold; font-style: italic;">stm32f10x.h</span></span><br>

+              </li>

+              <ul>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Update

+the stm32f10x.h file to support new Value line devices features: CEC

+peripheral, new General purpose timers TIM15, TIM16 and TIM17.</span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Peripherals Bits definitions updated to be in line with Value line devices available features.<br>

+                  </span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">HSE_Value,

+HSI_Value and HSEStartup_TimeOut changed to upper case: HSE_VALUE,

+HSI_VALUE and HSE_STARTUP_TIMEOUT. Old names are kept for legacy

+purposes.<br>

+                  </span></li>

+              </ul>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="text-decoration: underline;">STM32F10x CMSIS Cortex-M3 Device Peripheral Access Layer System Files:</span> <span style="font-weight: bold; font-style: italic;">system_stm32f10x.h and system_stm32f10x.c</span></span><br>

+                <span style="font-size: 10pt; font-family: Verdana;"></span></li>

+              <ul>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">SystemFrequency variable name changed to SystemCoreClock</span><br>

+                  <span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;"></span></span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Default

+                  </span></span><span style="font-size: 10pt; font-family: Verdana;">SystemCoreClock</span><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;"> is changed to 24MHz when Value line devices are selected and to 72MHz on other devices.</span></span><span style="font-size: 10pt;"><o:p></o:p></span><span style="font-size: 10pt; font-family: Verdana;"> <br>

+                  </span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">All while(1) loop were removed from all clock setting functions. User has to handle the HSE startup failure.<br>

+                  </span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Additional function <span style="font-weight: bold; font-style: italic;">void SystemCoreClockUpdate (void)</span> is provided.<br>

+                  </span></li>

+              </ul>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="text-decoration: underline;">STM32F10x CMSIS Startup files:</span> <span style="font-weight: bold; font-style: italic;">startup_stm32f10x_xx.s</span></span></li>

+              <ul>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add new

+startup files for STM32 Low-density Value line devices:

+                  <span style="font-weight: bold; font-style: italic;">startup_stm32f10x_ld_vl.s</span></span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add new startup

+files for STM32 Medium-density Value line devices:

+                  <span style="font-weight: bold; font-style: italic;">startup_stm32f10x_md_vl.s</span></span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">SystemInit() function is called from startup file (startup_stm32f10x_xx.s) before to branch to application main.<br>

+To reconfigure the default setting of SystemInit() function, refer to system_stm32f10x.c file <br>

+</span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">GNU startup file for Low density devices (startup_stm32f10x_ld.s) is updated to fix compilation errors.<br>

+</span></li>

+              </ul>

+

+            </ul>

+

+<ul style="margin-top: 0in;" type="disc">

+</ul>

+<h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><a name="License"></a><span style="font-size: 12pt; color: white;">License<o:p></o:p></span></h2>

+<p class="MsoNormal" style="margin: 4.5pt 0cm;"><span style="font-size: 10pt; font-family: Verdana; color: black;">The

+enclosed firmware and all the related documentation are not covered by

+a License Agreement, if you need such License you can contact your

+local STMicroelectronics office.<u1:p></u1:p><o:p></o:p></span></p>

+<p class="MsoNormal"><b style=""><span style="font-size: 10pt; font-family: Verdana; color: black;">THE

+PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO

+SAVE TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR

+ANY DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY

+CLAIMS ARISING FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY

+CUSTOMERS OF THE CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH

+THEIR PRODUCTS. <o:p></o:p></span></b></p>

+<p class="MsoNormal"><span style="color: black;"><o:p>&nbsp;</o:p></span></p>

+<div class="MsoNormal" style="text-align: center;" align="center"><span style="color: black;">

+<hr align="center" size="2" width="100%"></span></div>

+<p class="MsoNormal" style="margin: 4.5pt 0cm 4.5pt 18pt; text-align: center;" align="center"><span style="font-size: 10pt; font-family: Verdana; color: black;">For

+complete documentation on </span><span style="font-size: 10pt; font-family: Verdana;">STM32(<span style="color: black;">CORTEX M3) 32-Bit Microcontrollers

+visit </span><u><span style="color: blue;"><a href="http://www.st.com/stm32" target="_blank">www.st.com/STM32</a></span></u></span><span style="color: black;"><o:p></o:p></span></p>

+</td>

+</tr>

+</tbody>

+</table>

+<p class="MsoNormal"><span style="font-size: 10pt;"><o:p></o:p></span></p>

+</td>

+</tr>

+</tbody>

+</table>

+</div>

+<p class="MsoNormal"><o:p>&nbsp;</o:p></p>

+</div>

+</body></html>

+ 31 - 30
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s
查看文件 

@@ -1,33 +1,34 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_cl.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x Connectivity line Devices vector table for Atollic

- *            toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR

- *                  address.

-  *               - Configure the clock system

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_cl.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x Connectivity line Devices vector table for Atollic

+  *            toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR

+  *                  address.

+  *                - Configure the clock system

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

   .syntax unified

   .syntax unified

 	.cpu cortex-m3

 	.cpu cortex-m3

@@ -469,4 +470,4 @@ g_pfnVectors:
 
 	.weak	OTG_FS_IRQHandler

 	.weak	OTG_FS_IRQHandler

 	.thumb_set OTG_FS_IRQHandler ,Default_Handler

 	.thumb_set OTG_FS_IRQHandler ,Default_Handler

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 31 - 30
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s
查看文件 

@@ -1,33 +1,34 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_hd.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x High Density Devices vector table for Atollic toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address,

- *                - Configure the clock system  

- *                - Configure external SRAM mounted on STM3210E-EVAL board

- *                  to be used as data memory (optional, to be enabled by user)

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_hd.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x High Density Devices vector table for Atollic toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address,

+  *                - Configure the clock system  

+  *                - Configure external SRAM mounted on STM3210E-EVAL board

+  *                  to be used as data memory (optional, to be enabled by user)

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

     .syntax unified

     .syntax unified

 	.cpu cortex-m3

 	.cpu cortex-m3

@@ -465,4 +466,4 @@ g_pfnVectors:
 
 	.weak	DMA2_Channel4_5_IRQHandler

 	.weak	DMA2_Channel4_5_IRQHandler

 	.thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler

 	.thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 33 - 34
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s
查看文件 

@@ -1,33 +1,35 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_hd_vl.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x High Density Value Line Devices vector table for Atollic toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system  

- *                - Configure external SRAM mounted on STM32100E-EVAL board

- *                  to be used as data memory (optional, to be enabled by user)   

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_hd_vl.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x High Density Value Line Devices vector table for Atollic 

+  *            toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system  

+  *                - Configure external SRAM mounted on STM32100E-EVAL board

+  *                  to be used as data memory (optional, to be enabled by user)   

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

   .syntax unified

   .syntax unified

 	.cpu cortex-m3

 	.cpu cortex-m3

@@ -191,7 +193,7 @@ g_pfnVectors:
 
   .word TIM14_IRQHandler

   .word TIM14_IRQHandler

   .word 0

   .word 0

   .word 0

   .word 0

-  .word FSMC_IRQHandler

+  .word 0

   .word 0

   .word 0

   .word TIM5_IRQHandler

   .word TIM5_IRQHandler

   .word SPI3_IRQHandler

   .word SPI3_IRQHandler

@@ -412,9 +414,6 @@ g_pfnVectors:
 
   .weak  TIM14_IRQHandler

   .weak  TIM14_IRQHandler

   .thumb_set TIM14_IRQHandler,Default_Handler

   .thumb_set TIM14_IRQHandler,Default_Handler

 

 

-  .weak  FSMC_IRQHandler

-  .thumb_set FSMC_IRQHandler,Default_Handler

-

   .weak  TIM5_IRQHandler

   .weak  TIM5_IRQHandler

   .thumb_set TIM5_IRQHandler,Default_Handler

   .thumb_set TIM5_IRQHandler,Default_Handler

 

 

@@ -448,5 +447,5 @@ g_pfnVectors:
 
   .weak  DMA2_Channel5_IRQHandler

   .weak  DMA2_Channel5_IRQHandler

   .thumb_set DMA2_Channel5_IRQHandler,Default_Handler

   .thumb_set DMA2_Channel5_IRQHandler,Default_Handler

   

   

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 29 - 28
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s
查看文件 

@@ -1,31 +1,32 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_ld.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x Low Density Devices vector table for Atollic toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address.

- *                - Configure the clock system 

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_ld.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x Low Density Devices vector table for Atollic toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address.

+  *                - Configure the clock system 

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

   .syntax unified

   .syntax unified

 	.cpu cortex-m3

 	.cpu cortex-m3

@@ -343,4 +344,4 @@ g_pfnVectors:
 
 	.weak	USBWakeUp_IRQHandler

 	.weak	USBWakeUp_IRQHandler

 	.thumb_set USBWakeUp_IRQHandler,Default_Handler

 	.thumb_set USBWakeUp_IRQHandler,Default_Handler

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 29 - 28
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s
查看文件 

@@ -1,31 +1,32 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_ld_vl.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x Low Density Value Line Devices vector table for Atollic toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system   

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_ld_vl.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x Low Density Value Line Devices vector table for Atollic toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system   

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

   .syntax unified

   .syntax unified

 	.cpu cortex-m3

 	.cpu cortex-m3

@@ -387,5 +388,5 @@ g_pfnVectors:
 
   .weak  TIM7_IRQHandler

   .weak  TIM7_IRQHandler

   .thumb_set TIM7_IRQHandler,Default_Handler  

   .thumb_set TIM7_IRQHandler,Default_Handler  

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 29 - 28
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s
查看文件 

@@ -1,31 +1,32 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_md.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x Medium Density Devices vector table for Atollic toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_md.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x Medium Density Devices vector table for Atollic toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

   .syntax unified

   .syntax unified

 	.cpu cortex-m3

 	.cpu cortex-m3

@@ -358,5 +359,5 @@ g_pfnVectors:
 
 	.weak	USBWakeUp_IRQHandler

 	.weak	USBWakeUp_IRQHandler

 	.thumb_set USBWakeUp_IRQHandler,Default_Handler

 	.thumb_set USBWakeUp_IRQHandler,Default_Handler

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 30 - 28
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s
查看文件 

@@ -1,31 +1,33 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_md_vl.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x Medium Density Value Line Devices vector table for Atollic toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system   

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_md_vl.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x Medium Density Value Line Devices vector table for Atollic 

+  *            toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system   

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

   .syntax unified

   .syntax unified

 	.cpu cortex-m3

 	.cpu cortex-m3

@@ -402,5 +404,5 @@ g_pfnVectors:
 
   .weak  TIM7_IRQHandler

   .weak  TIM7_IRQHandler

   .thumb_set TIM7_IRQHandler,Default_Handler  

   .thumb_set TIM7_IRQHandler,Default_Handler  

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 31 - 30
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s
查看文件 

@@ -1,33 +1,34 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_xl.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x XL-Density Devices vector table for TrueSTUDIO toolchain. 

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system and the external SRAM mounted on 

- *                  STM3210E-EVAL board to be used as data memory (optional, 

- *                  to be enabled by user)

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_xl.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x XL-Density Devices vector table for TrueSTUDIO toolchain. 

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system and the external SRAM mounted on 

+  *                  STM3210E-EVAL board to be used as data memory (optional, 

+  *                  to be enabled by user)

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

     

     

   .syntax unified

   .syntax unified

   .cpu cortex-m3

   .cpu cortex-m3

@@ -463,4 +464,4 @@ g_pfnVectors:
 
   .weak  DMA2_Channel4_5_IRQHandler

   .weak  DMA2_Channel4_5_IRQHandler

   .thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler

   .thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 4 - 4
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s
查看文件 

@@ -1,8 +1,8 @@
 
-;******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_cl.s

 ;* File Name          : startup_stm32f10x_cl.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x Connectivity line devices vector table for MDK-ARM 

 ;* Description        : STM32F10x Connectivity line devices vector table for MDK-ARM 

 ;*                      toolchain. 

 ;*                      toolchain. 

 ;*                      This module performs:

 ;*                      This module performs:

@@ -365,4 +365,4 @@ __user_initial_stackheap
 
 

 

                  END

                  END

 

 

-;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE*****

+;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****

+ 4 - 4
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s
查看文件 

@@ -1,8 +1,8 @@
 
-;******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_hd.s

 ;* File Name          : startup_stm32f10x_hd.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x High Density Devices vector table for MDK-ARM 

 ;* Description        : STM32F10x High Density Devices vector table for MDK-ARM 

 ;*                      toolchain. 

 ;*                      toolchain. 

 ;*                      This module performs:

 ;*                      This module performs:

@@ -355,4 +355,4 @@ __user_initial_stackheap
 
 

 

                  END

                  END

 

 

-;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE*****

+;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****

+ 5 - 7
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s
查看文件 

@@ -1,8 +1,8 @@
 
-;******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_hd_vl.s

 ;* File Name          : startup_stm32f10x_hd_vl.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x High Density Value Line Devices vector table  

 ;* Description        : STM32F10x High Density Value Line Devices vector table  

 ;*                      for MDK-ARM toolchain.  

 ;*                      for MDK-ARM toolchain.  

 ;*                      This module performs:

 ;*                      This module performs:

@@ -126,7 +126,7 @@ __Vectors       DCD     __initial_sp                    ; Top of Stack
 
                 DCD     TIM14_IRQHandler                ; TIM14

                 DCD     TIM14_IRQHandler                ; TIM14

                 DCD     0                               ; Reserved

                 DCD     0                               ; Reserved

                 DCD     0                               ; Reserved

                 DCD     0                               ; Reserved

-                DCD     FSMC_IRQHandler                 ; FSMC

+                DCD     0                               ; Reserved

                 DCD     0                               ; Reserved

                 DCD     0                               ; Reserved

                 DCD     TIM5_IRQHandler                 ; TIM5

                 DCD     TIM5_IRQHandler                 ; TIM5

                 DCD     SPI3_IRQHandler                 ; SPI3

                 DCD     SPI3_IRQHandler                 ; SPI3

@@ -244,7 +244,6 @@ Default_Handler PROC
 
                 EXPORT  TIM12_IRQHandler                 [WEAK]

                 EXPORT  TIM12_IRQHandler                 [WEAK]

                 EXPORT  TIM13_IRQHandler                 [WEAK]

                 EXPORT  TIM13_IRQHandler                 [WEAK]

                 EXPORT  TIM14_IRQHandler                 [WEAK]

                 EXPORT  TIM14_IRQHandler                 [WEAK]

-                EXPORT  FSMC_IRQHandler                  [WEAK]

                 EXPORT  TIM5_IRQHandler                  [WEAK]

                 EXPORT  TIM5_IRQHandler                  [WEAK]

                 EXPORT  SPI3_IRQHandler                  [WEAK]

                 EXPORT  SPI3_IRQHandler                  [WEAK]

                 EXPORT  UART4_IRQHandler                 [WEAK]

                 EXPORT  UART4_IRQHandler                 [WEAK]

@@ -299,7 +298,6 @@ CEC_IRQHandler
 
 TIM12_IRQHandler

 TIM12_IRQHandler

 TIM13_IRQHandler

 TIM13_IRQHandler

 TIM14_IRQHandler

 TIM14_IRQHandler

-FSMC_IRQHandler

 TIM5_IRQHandler

 TIM5_IRQHandler

 SPI3_IRQHandler

 SPI3_IRQHandler

 UART4_IRQHandler

 UART4_IRQHandler

@@ -345,4 +343,4 @@ __user_initial_stackheap
 
 

 

                  END

                  END

 

 

-;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE*****

+;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****

+ 4 - 4
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s
查看文件 

@@ -1,8 +1,8 @@
 
-;******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_ld.s

 ;* File Name          : startup_stm32f10x_ld.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x Low Density Devices vector table for MDK-ARM 

 ;* Description        : STM32F10x Low Density Devices vector table for MDK-ARM 

 ;*                      toolchain. 

 ;*                      toolchain. 

 ;*                      This module performs:

 ;*                      This module performs:

@@ -294,4 +294,4 @@ __user_initial_stackheap
 
 

 

                  END

                  END

 

 

-;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE*****

+;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****

+ 4 - 4
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s
查看文件 

@@ -1,8 +1,8 @@
 
-;******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_ld_vl.s

 ;* File Name          : startup_stm32f10x_ld_vl.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x Low Density Value Line Devices vector table  

 ;* Description        : STM32F10x Low Density Value Line Devices vector table  

 ;*                      for MDK-ARM toolchain.  

 ;*                      for MDK-ARM toolchain.  

 ;*                      This module performs:

 ;*                      This module performs:

@@ -301,4 +301,4 @@ __user_initial_stackheap
 
 

 

                  END

                  END

 

 

-;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE*****

+;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****

+ 4 - 4
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s
查看文件 

@@ -1,8 +1,8 @@
 
-;******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_md.s

 ;* File Name          : startup_stm32f10x_md.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x Medium Density Devices vector table for MDK-ARM 

 ;* Description        : STM32F10x Medium Density Devices vector table for MDK-ARM 

 ;*                      toolchain.  

 ;*                      toolchain.  

 ;*                      This module performs:

 ;*                      This module performs:

@@ -304,4 +304,4 @@ __user_initial_stackheap
 
 

 

                  END

                  END

 

 

-;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE*****

+;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****

+ 4 - 4
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s
查看文件 

@@ -1,8 +1,8 @@
 
-;******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_md_vl.s

 ;* File Name          : startup_stm32f10x_md_vl.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x Medium Density Value Line Devices vector table  

 ;* Description        : STM32F10x Medium Density Value Line Devices vector table  

 ;*                      for MDK-ARM toolchain.  

 ;*                      for MDK-ARM toolchain.  

 ;*                      This module performs:

 ;*                      This module performs:

@@ -312,4 +312,4 @@ __user_initial_stackheap
 
 

 

                  END

                  END

 

 

-;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE*****

+;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****

+ 4 - 4
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s
查看文件 

@@ -1,8 +1,8 @@
 
-;******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_xl.s

 ;* File Name          : startup_stm32f10x_xl.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x XL-Density Devices vector table for MDK-ARM 

 ;* Description        : STM32F10x XL-Density Devices vector table for MDK-ARM 

 ;*                      toolchain. 

 ;*                      toolchain. 

 ;*                      This module performs:

 ;*                      This module performs:

@@ -355,4 +355,4 @@ __user_initial_stackheap
 
 

 

                  END

                  END

 

 

-;******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE*****

+;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****

+ 30 - 29
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s
查看文件 

@@ -1,32 +1,33 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_cl.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x Connectivity line Devices vector table for RIDE7 toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR 

- *                  address.

- *                - Configure the clock system    

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_cl.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x Connectivity line Devices vector table for RIDE7 toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR 

+  *                  address.

+  *                - Configure the clock system    

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

     

     

   .syntax unified

   .syntax unified

   .cpu cortex-m3

   .cpu cortex-m3

@@ -464,4 +465,4 @@ g_pfnVectors:
 
   .weak  OTG_FS_IRQHandler  

   .weak  OTG_FS_IRQHandler  

   .thumb_set OTG_FS_IRQHandler ,Default_Handler

   .thumb_set OTG_FS_IRQHandler ,Default_Handler

  

  

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 31 - 30
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s
查看文件 

@@ -1,33 +1,34 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_hd.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x High Density Devices vector table for RIDE7 toolchain. 

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system and the external SRAM mounted on 

- *                  STM3210E-EVAL board to be used as data memory (optional, 

- *                  to be enabled by user)

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_hd.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x High Density Devices vector table for RIDE7 toolchain. 

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system and the external SRAM mounted on 

+  *                  STM3210E-EVAL board to be used as data memory (optional, 

+  *                  to be enabled by user)

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

     

     

   .syntax unified

   .syntax unified

   .cpu cortex-m3

   .cpu cortex-m3

@@ -461,4 +462,4 @@ g_pfnVectors:
 
   .weak  DMA2_Channel4_5_IRQHandler

   .weak  DMA2_Channel4_5_IRQHandler

   .thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler

   .thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 33 - 35
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s
查看文件 

@@ -1,34 +1,35 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_hd_vl.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x High Density Value Line Devices vector table for RIDE7

- *            toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system and the external SRAM mounted on 

- *                  STM32100E-EVAL board to be used as data memory (optional, 

- *                  to be enabled by user)               

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_hd_vl.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x High Density Value Line Devices vector table for RIDE7

+  *            toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system and the external SRAM mounted on 

+  *                  STM32100E-EVAL board to be used as data memory (optional, 

+  *                  to be enabled by user)               

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

     

     

   .syntax unified

   .syntax unified

   .cpu cortex-m3

   .cpu cortex-m3

@@ -187,7 +188,7 @@ g_pfnVectors:
 
   .word  TIM14_IRQHandler

   .word  TIM14_IRQHandler

   .word  0

   .word  0

   .word  0

   .word  0

-  .word  FSMC_IRQHandler

+  .word  0

   .word  0

   .word  0

   .word  TIM5_IRQHandler

   .word  TIM5_IRQHandler

   .word  SPI3_IRQHandler

   .word  SPI3_IRQHandler

@@ -405,9 +406,6 @@ g_pfnVectors:
 
   .weak  TIM14_IRQHandler

   .weak  TIM14_IRQHandler

   .thumb_set TIM14_IRQHandler,Default_Handler

   .thumb_set TIM14_IRQHandler,Default_Handler

 

 

-  .weak  FSMC_IRQHandler

-  .thumb_set FSMC_IRQHandler,Default_Handler

-

   .weak  TIM5_IRQHandler

   .weak  TIM5_IRQHandler

   .thumb_set TIM5_IRQHandler,Default_Handler

   .thumb_set TIM5_IRQHandler,Default_Handler

 

 

@@ -441,4 +439,4 @@ g_pfnVectors:
 
   .weak  DMA2_Channel5_IRQHandler

   .weak  DMA2_Channel5_IRQHandler

   .thumb_set DMA2_Channel5_IRQHandler,Default_Handler      

   .thumb_set DMA2_Channel5_IRQHandler,Default_Handler      

   

   

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 29 - 28
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s
查看文件 

@@ -1,31 +1,32 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_ld.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x Low Density Devices vector table for RIDE7 toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system  

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */	

+  ******************************************************************************

+  * @file      startup_stm32f10x_ld.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x Low Density Devices vector table for RIDE7 toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system  

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */	

     

     

   .syntax unified

   .syntax unified

 	.cpu cortex-m3

 	.cpu cortex-m3

@@ -339,4 +340,4 @@ g_pfnVectors:
 
 	.weak	USBWakeUp_IRQHandler

 	.weak	USBWakeUp_IRQHandler

 	.thumb_set USBWakeUp_IRQHandler,Default_Handler  

 	.thumb_set USBWakeUp_IRQHandler,Default_Handler  

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 30 - 29
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s
查看文件 

@@ -1,32 +1,33 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_ld_vl.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x Low Density Value Line Devices vector table for RIDE7

- *            toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system 

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_ld_vl.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x Low Density Value Line Devices vector table for RIDE7

+  *            toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system 

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

     

     

   .syntax unified

   .syntax unified

   .cpu cortex-m3

   .cpu cortex-m3

@@ -379,4 +380,4 @@ g_pfnVectors:
 
   .weak  TIM7_IRQHandler

   .weak  TIM7_IRQHandler

   .thumb_set TIM7_IRQHandler,Default_Handler  

   .thumb_set TIM7_IRQHandler,Default_Handler  

   

   

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 29 - 28
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s
查看文件 

@@ -1,31 +1,32 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_md.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x Medium Density Devices vector table for RIDE7 toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system 

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */	

+  ******************************************************************************

+  * @file      startup_stm32f10x_md.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x Medium Density Devices vector table for RIDE7 toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system 

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

     

     

   .syntax unified

   .syntax unified

 	.cpu cortex-m3

 	.cpu cortex-m3

@@ -354,4 +355,4 @@ g_pfnVectors:
 
 	.weak	USBWakeUp_IRQHandler

 	.weak	USBWakeUp_IRQHandler

 	.thumb_set USBWakeUp_IRQHandler,Default_Handler

 	.thumb_set USBWakeUp_IRQHandler,Default_Handler

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 30 - 29
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s
查看文件 

@@ -1,32 +1,33 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_md_vl.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x Medium Density Value Line Devices vector table for RIDE7

- *            toolchain.

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system                 

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_md_vl.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x Medium Density Value Line Devices vector table for RIDE7

+  *            toolchain.

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system                 

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

     

     

   .syntax unified

   .syntax unified

   .cpu cortex-m3

   .cpu cortex-m3

@@ -395,4 +396,4 @@ g_pfnVectors:
 
   .weak  TIM7_IRQHandler

   .weak  TIM7_IRQHandler

   .thumb_set TIM7_IRQHandler,Default_Handler  

   .thumb_set TIM7_IRQHandler,Default_Handler  

   

   

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 31 - 30
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s
查看文件 

@@ -1,33 +1,34 @@
 
 /**

 /**

- ******************************************************************************

- * @file      startup_stm32f10x_xl.s

- * @author    MCD Application Team

- * @version   V3.4.0

- * @date      10/15/2010

- * @brief     STM32F10x XL-Density Devices vector table for RIDE7 toolchain. 

- *            This module performs:

- *                - Set the initial SP

- *                - Set the initial PC == Reset_Handler,

- *                - Set the vector table entries with the exceptions ISR address

- *                - Configure the clock system and the external SRAM mounted on 

- *                  STM3210E-EVAL board to be used as data memory (optional, 

- *                  to be enabled by user)

- *                - Branches to main in the C library (which eventually

- *                  calls main()).

- *            After Reset the Cortex-M3 processor is in Thread mode,

- *            priority is Privileged, and the Stack is set to Main.

- *******************************************************************************

- * @copy

- *

- * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

- * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

- * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

- * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

- * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

- * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

- *

- * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

- */

+  ******************************************************************************

+  * @file      startup_stm32f10x_xl.s

+  * @author    MCD Application Team

+  * @version   V3.5.0

+  * @date      11-March-2011

+  * @brief     STM32F10x XL-Density Devices vector table for RIDE7 toolchain. 

+  *            This module performs:

+  *                - Set the initial SP

+  *                - Set the initial PC == Reset_Handler,

+  *                - Set the vector table entries with the exceptions ISR address

+  *                - Configure the clock system and the external SRAM mounted on 

+  *                  STM3210E-EVAL board to be used as data memory (optional, 

+  *                  to be enabled by user)

+  *                - Branches to main in the C library (which eventually

+  *                  calls main()).

+  *            After Reset the Cortex-M3 processor is in Thread mode,

+  *            priority is Privileged, and the Stack is set to Main.

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

     

     

   .syntax unified

   .syntax unified

   .cpu cortex-m3

   .cpu cortex-m3

@@ -461,4 +462,4 @@ g_pfnVectors:
 
   .weak  DMA2_Channel4_5_IRQHandler

   .weak  DMA2_Channel4_5_IRQHandler

   .thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler

   .thumb_set DMA2_Channel4_5_IRQHandler,Default_Handler

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 6 - 6
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s
查看文件 

@@ -1,10 +1,10 @@
 
-;/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics *******************

 ;* File Name          : startup_stm32f10x_cl.s

 ;* File Name          : startup_stm32f10x_cl.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x Connectivity line devices vector table for 

 ;* Description        : STM32F10x Connectivity line devices vector table for 

-;*                      EWARM5.x toolchain.

+;*                      EWARM toolchain.

 ;*                      This module performs:

 ;*                      This module performs:

 ;*                      - Set the initial SP

 ;*                      - Set the initial SP

 ;*                      - Configure the clock system

 ;*                      - Configure the clock system

@@ -20,7 +20,7 @@
 
 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

-;*******************************************************************************/

+;*******************************************************************************

 ;

 ;

 ;

 ;

 ; The modules in this file are included in the libraries, and may be replaced

 ; The modules in this file are included in the libraries, and may be replaced

@@ -504,4 +504,4 @@ OTG_FS_IRQHandler
 
         B OTG_FS_IRQHandler

         B OTG_FS_IRQHandler

 

 

         END

         END

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 6 - 6
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s
查看文件 

@@ -1,9 +1,9 @@
 
-;/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_hd.s

 ;* File Name          : startup_stm32f10x_hd.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

-;* Description        : STM32F10x High Density Devices vector table for EWARM5.x 

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

+;* Description        : STM32F10x High Density Devices vector table for EWARM 

 ;*                      toolchain.

 ;*                      toolchain.

 ;*                      This module performs:

 ;*                      This module performs:

 ;*                      - Set the initial SP

 ;*                      - Set the initial SP

@@ -21,7 +21,7 @@
 
 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

-;*******************************************************************************/

+;*******************************************************************************

 ;

 ;

 ;

 ;

 ; The modules in this file are included in the libraries, and may be replaced

 ; The modules in this file are included in the libraries, and may be replaced

@@ -493,4 +493,4 @@ DMA2_Channel4_5_IRQHandler
 
         

         

         END

         END

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 12
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s
查看文件 

@@ -1,10 +1,10 @@
 
-;/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_hd_vl.s

 ;* File Name          : startup_stm32f10x_hd_vl.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x High Density Value Line Devices vector table 

 ;* Description        : STM32F10x High Density Value Line Devices vector table 

-;*                      for EWARM5.x toolchain.

+;*                      for EWARM toolchain.

 ;*                      This module performs:

 ;*                      This module performs:

 ;*                      - Set the initial SP

 ;*                      - Set the initial SP

 ;*                      - Configure the clock system and the external SRAM 

 ;*                      - Configure the clock system and the external SRAM 

@@ -22,7 +22,7 @@
 
 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

-;*******************************************************************************/

+;*******************************************************************************

 ;

 ;

 ;

 ;

 ; The modules in this file are included in the libraries, and may be replaced

 ; The modules in this file are included in the libraries, and may be replaced

@@ -119,7 +119,7 @@ __vector_table
 
         DCD     TIM14_IRQHandler              ; TIM14

         DCD     TIM14_IRQHandler              ; TIM14

         DCD     0                             ; Reserved

         DCD     0                             ; Reserved

         DCD     0                             ; Reserved

         DCD     0                             ; Reserved

-        DCD     FSMC_IRQHandler               ; FSMC

+        DCD     0                             ; Reserved

         DCD     0                             ; Reserved

         DCD     0                             ; Reserved

         DCD     TIM5_IRQHandler               ; TIM5

         DCD     TIM5_IRQHandler               ; TIM5

         DCD     SPI3_IRQHandler               ; SPI3

         DCD     SPI3_IRQHandler               ; SPI3

@@ -402,11 +402,6 @@ TIM13_IRQHandler
 
 TIM14_IRQHandler

 TIM14_IRQHandler

         B TIM14_IRQHandler

         B TIM14_IRQHandler

 

 

-        PUBWEAK FSMC_IRQHandler

-        SECTION .text:CODE:REORDER(1)

-FSMC_IRQHandler

-        B FSMC_IRQHandler

-

         PUBWEAK TIM5_IRQHandler

         PUBWEAK TIM5_IRQHandler

         SECTION .text:CODE:REORDER(1)

         SECTION .text:CODE:REORDER(1)

 TIM5_IRQHandler

 TIM5_IRQHandler

@@ -463,4 +458,4 @@ DMA2_Channel5_IRQHandler
 
         B DMA2_Channel5_IRQHandler

         B DMA2_Channel5_IRQHandler

                 

                 

         END

         END

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 6 - 6
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s
查看文件 

@@ -1,9 +1,9 @@
 
-;/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_ld.s

 ;* File Name          : startup_stm32f10x_ld.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

-;* Description        : STM32F10x Low Density Devices vector table for EWARM5.x 

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

+;* Description        : STM32F10x Low Density Devices vector table for EWARM

 ;*                      toolchain.

 ;*                      toolchain.

 ;*                      This module performs:

 ;*                      This module performs:

 ;*                      - Set the initial SP

 ;*                      - Set the initial SP

@@ -20,7 +20,7 @@
 
 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

-;*******************************************************************************/

+;*******************************************************************************

 ;

 ;

 ;

 ;

 ; The modules in this file are included in the libraries, and may be replaced

 ; The modules in this file are included in the libraries, and may be replaced

@@ -363,4 +363,4 @@ USBWakeUp_IRQHandler
 
         B USBWakeUp_IRQHandler

         B USBWakeUp_IRQHandler

 

 

         END

         END

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 6 - 6
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s
查看文件 

@@ -1,10 +1,10 @@
 
-;/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_ld_vl.s

 ;* File Name          : startup_stm32f10x_ld_vl.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x Low Density Value Line Devices vector table 

 ;* Description        : STM32F10x Low Density Value Line Devices vector table 

-;*                      for EWARM5.x toolchain.

+;*                      for EWARM toolchain.

 ;*                      This module performs:

 ;*                      This module performs:

 ;*                      - Set the initial SP

 ;*                      - Set the initial SP

 ;*                      - Configure the clock system

 ;*                      - Configure the clock system

@@ -20,7 +20,7 @@
 
 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

-;*******************************************************************************/

+;*******************************************************************************

 ;

 ;

 ;

 ;

 ; The modules in this file are included in the libraries, and may be replaced

 ; The modules in this file are included in the libraries, and may be replaced

@@ -366,4 +366,4 @@ TIM7_IRQHandler
 
         B TIM7_IRQHandler                

         B TIM7_IRQHandler                

 

 

         END

         END

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 6 - 6
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s
查看文件 

@@ -1,10 +1,10 @@
 
-;/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_md.s

 ;* File Name          : startup_stm32f10x_md.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x Medium Density Devices vector table for 

 ;* Description        : STM32F10x Medium Density Devices vector table for 

-;*                      EWARM5.x toolchain.

+;*                      EWARM toolchain.

 ;*                      This module performs:

 ;*                      This module performs:

 ;*                      - Set the initial SP

 ;*                      - Set the initial SP

 ;*                      - Configure the clock system

 ;*                      - Configure the clock system

@@ -20,7 +20,7 @@
 
 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

-;*******************************************************************************/

+;*******************************************************************************

 ;

 ;

 ;

 ;

 ; The modules in this file are included in the libraries, and may be replaced

 ; The modules in this file are included in the libraries, and may be replaced

@@ -388,4 +388,4 @@ USBWakeUp_IRQHandler
 
         B USBWakeUp_IRQHandler

         B USBWakeUp_IRQHandler

 

 

         END

         END

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 6 - 6
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s
查看文件 

@@ -1,10 +1,10 @@
 
-;/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_md_vl.s

 ;* File Name          : startup_stm32f10x_md_vl.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

 ;* Description        : STM32F10x Medium Density Value Line Devices vector table 

 ;* Description        : STM32F10x Medium Density Value Line Devices vector table 

-;*                      for EWARM5.x toolchain.

+;*                      for EWARM toolchain.

 ;*                      This module performs:

 ;*                      This module performs:

 ;*                      - Set the initial SP

 ;*                      - Set the initial SP

 ;*                      - Configure the clock system

 ;*                      - Configure the clock system

@@ -20,7 +20,7 @@
 
 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

-;*******************************************************************************/

+;*******************************************************************************

 ;

 ;

 ;

 ;

 ; The modules in this file are included in the libraries, and may be replaced

 ; The modules in this file are included in the libraries, and may be replaced

@@ -391,4 +391,4 @@ TIM7_IRQHandler
 
         B TIM7_IRQHandler                

         B TIM7_IRQHandler                

 

 

         END

         END

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 6 - 6
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s
查看文件 

@@ -1,9 +1,9 @@
 
-;/******************** (C) COPYRIGHT 2010 STMicroelectronics ********************

+;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************

 ;* File Name          : startup_stm32f10x_xl.s

 ;* File Name          : startup_stm32f10x_xl.s

 ;* Author             : MCD Application Team

 ;* Author             : MCD Application Team

-;* Version            : V3.4.0

-;* Date               : 10/15/2010

-;* Description        : STM32F10x XL-Density Devices vector table for EWARM5.x 

+;* Version            : V3.5.0

+;* Date               : 11-March-2011

+;* Description        : STM32F10x XL-Density Devices vector table for EWARM 

 ;*                      toolchain.

 ;*                      toolchain.

 ;*                      This module performs:

 ;*                      This module performs:

 ;*                      - Set the initial SP

 ;*                      - Set the initial SP

@@ -21,7 +21,7 @@
 
 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

 ;* INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

-;*******************************************************************************/

+;*******************************************************************************

 ;

 ;

 ;

 ;

 ; The modules in this file are included in the libraries, and may be replaced

 ; The modules in this file are included in the libraries, and may be replaced

@@ -493,4 +493,4 @@ DMA2_Channel4_5_IRQHandler
 
         

         

         END

         END

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

文件差異過大導致無法顯示
+ 432 - 415
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h


+ 1094 - 0
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
查看文件 

@@ -0,0 +1,1094 @@
 
+/**

+  ******************************************************************************

+  * @file    system_stm32f10x.c

+  * @author  MCD Application Team

+  * @version V3.5.0

+  * @date    11-March-2011

+  * @brief   CMSIS Cortex-M3 Device Peripheral Access Layer System Source File.

+  * 

+  * 1.  This file provides two functions and one global variable to be called from 

+  *     user application:

+  *      - SystemInit(): Setups the system clock (System clock source, PLL Multiplier

+  *                      factors, AHB/APBx prescalers and Flash settings). 

+  *                      This function is called at startup just after reset and 

+  *                      before branch to main program. This call is made inside

+  *                      the "startup_stm32f10x_xx.s" file.

+  *

+  *      - SystemCoreClock variable: Contains the core clock (HCLK), it can be used

+  *                                  by the user application to setup the SysTick 

+  *                                  timer or configure other parameters.

+  *                                     

+  *      - SystemCoreClockUpdate(): Updates the variable SystemCoreClock and must

+  *                                 be called whenever the core clock is changed

+  *                                 during program execution.

+  *

+  * 2. After each device reset the HSI (8 MHz) is used as system clock source.

+  *    Then SystemInit() function is called, in "startup_stm32f10x_xx.s" file, to

+  *    configure the system clock before to branch to main program.

+  *

+  * 3. If the system clock source selected by user fails to startup, the SystemInit()

+  *    function will do nothing and HSI still used as system clock source. User can 

+  *    add some code to deal with this issue inside the SetSysClock() function.

+  *

+  * 4. The default value of HSE crystal is set to 8 MHz (or 25 MHz, depedning on

+  *    the product used), refer to "HSE_VALUE" define in "stm32f10x.h" file. 

+  *    When HSE is used as system clock source, directly or through PLL, and you

+  *    are using different crystal you have to adapt the HSE value to your own

+  *    configuration.

+  *        

+  ******************************************************************************

+  * @attention

+  *

+  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

+  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY

+  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING

+  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

+  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

+  *

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

+

+/** @addtogroup CMSIS

+  * @{

+  */

+

+/** @addtogroup stm32f10x_system

+  * @{

+  */  

+  

+/** @addtogroup STM32F10x_System_Private_Includes

+  * @{

+  */

+

+#include "stm32f10x.h"

+

+/**

+  * @}

+  */

+

+/** @addtogroup STM32F10x_System_Private_TypesDefinitions

+  * @{

+  */

+

+/**

+  * @}

+  */

+

+/** @addtogroup STM32F10x_System_Private_Defines

+  * @{

+  */

+

+/*!< Uncomment the line corresponding to the desired System clock (SYSCLK)

+   frequency (after reset the HSI is used as SYSCLK source)

+   

+   IMPORTANT NOTE:

+   ============== 

+   1. After each device reset the HSI is used as System clock source.

+

+   2. Please make sure that the selected System clock doesn't exceed your device's

+      maximum frequency.

+      

+   3. If none of the define below is enabled, the HSI is used as System clock

+    source.

+

+   4. The System clock configuration functions provided within this file assume that:

+        - For Low, Medium and High density Value line devices an external 8MHz 

+          crystal is used to drive the System clock.

+        - For Low, Medium and High density devices an external 8MHz crystal is

+          used to drive the System clock.

+        - For Connectivity line devices an external 25MHz crystal is used to drive

+          the System clock.

+     If you are using different crystal you have to adapt those functions accordingly.

+    */

+    

+#if defined (STM32F10X_LD_VL) || (defined STM32F10X_MD_VL) || (defined STM32F10X_HD_VL)

+/* #define SYSCLK_FREQ_HSE    HSE_VALUE */

+ #define SYSCLK_FREQ_24MHz  24000000

+#else

+/* #define SYSCLK_FREQ_HSE    HSE_VALUE */

+/* #define SYSCLK_FREQ_24MHz  24000000 */ 

+/* #define SYSCLK_FREQ_36MHz  36000000 */

+/* #define SYSCLK_FREQ_48MHz  48000000 */

+/* #define SYSCLK_FREQ_56MHz  56000000 */

+#define SYSCLK_FREQ_72MHz  72000000

+#endif

+

+/*!< Uncomment the following line if you need to use external SRAM mounted

+     on STM3210E-EVAL board (STM32 High density and XL-density devices) or on 

+     STM32100E-EVAL board (STM32 High-density value line devices) as data memory */ 

+#if defined (STM32F10X_HD) || (defined STM32F10X_XL) || (defined STM32F10X_HD_VL)

+/* #define DATA_IN_ExtSRAM */

+#endif

+

+/*!< Uncomment the following line if you need to relocate your vector Table in

+     Internal SRAM. */ 

+/* #define VECT_TAB_SRAM */

+#define VECT_TAB_OFFSET  0x0 /*!< Vector Table base offset field. 

+                                  This value must be a multiple of 0x200. */

+

+

+/**

+  * @}

+  */

+

+/** @addtogroup STM32F10x_System_Private_Macros

+  * @{

+  */

+

+/**

+  * @}

+  */

+

+/** @addtogroup STM32F10x_System_Private_Variables

+  * @{

+  */

+

+/*******************************************************************************

+*  Clock Definitions

+*******************************************************************************/

+#ifdef SYSCLK_FREQ_HSE

+  uint32_t SystemCoreClock         = SYSCLK_FREQ_HSE;        /*!< System Clock Frequency (Core Clock) */

+#elif defined SYSCLK_FREQ_24MHz

+  uint32_t SystemCoreClock         = SYSCLK_FREQ_24MHz;        /*!< System Clock Frequency (Core Clock) */

+#elif defined SYSCLK_FREQ_36MHz

+  uint32_t SystemCoreClock         = SYSCLK_FREQ_36MHz;        /*!< System Clock Frequency (Core Clock) */

+#elif defined SYSCLK_FREQ_48MHz

+  uint32_t SystemCoreClock         = SYSCLK_FREQ_48MHz;        /*!< System Clock Frequency (Core Clock) */

+#elif defined SYSCLK_FREQ_56MHz

+  uint32_t SystemCoreClock         = SYSCLK_FREQ_56MHz;        /*!< System Clock Frequency (Core Clock) */

+#elif defined SYSCLK_FREQ_72MHz

+  uint32_t SystemCoreClock         = SYSCLK_FREQ_72MHz;        /*!< System Clock Frequency (Core Clock) */

+#else /*!< HSI Selected as System Clock source */

+  uint32_t SystemCoreClock         = HSI_VALUE;        /*!< System Clock Frequency (Core Clock) */

+#endif

+

+__I uint8_t AHBPrescTable[16] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9};

+/**

+  * @}

+  */

+

+/** @addtogroup STM32F10x_System_Private_FunctionPrototypes

+  * @{

+  */

+

+static void SetSysClock(void);

+

+#ifdef SYSCLK_FREQ_HSE

+  static void SetSysClockToHSE(void);

+#elif defined SYSCLK_FREQ_24MHz

+  static void SetSysClockTo24(void);

+#elif defined SYSCLK_FREQ_36MHz

+  static void SetSysClockTo36(void);

+#elif defined SYSCLK_FREQ_48MHz

+  static void SetSysClockTo48(void);

+#elif defined SYSCLK_FREQ_56MHz

+  static void SetSysClockTo56(void);  

+#elif defined SYSCLK_FREQ_72MHz

+  static void SetSysClockTo72(void);

+#endif

+

+#ifdef DATA_IN_ExtSRAM

+  static void SystemInit_ExtMemCtl(void); 

+#endif /* DATA_IN_ExtSRAM */

+

+/**

+  * @}

+  */

+

+/** @addtogroup STM32F10x_System_Private_Functions

+  * @{

+  */

+

+/**

+  * @brief  Setup the microcontroller system

+  *         Initialize the Embedded Flash Interface, the PLL and update the 

+  *         SystemCoreClock variable.

+  * @note   This function should be used only after reset.

+  * @param  None

+  * @retval None

+  */

+void SystemInit (void)

+{

+  /* Reset the RCC clock configuration to the default reset state(for debug purpose) */

+  /* Set HSION bit */

+  RCC->CR |= (uint32_t)0x00000001;

+

+  /* Reset SW, HPRE, PPRE1, PPRE2, ADCPRE and MCO bits */

+#ifndef STM32F10X_CL

+  RCC->CFGR &= (uint32_t)0xF8FF0000;

+#else

+  RCC->CFGR &= (uint32_t)0xF0FF0000;

+#endif /* STM32F10X_CL */   

+  

+  /* Reset HSEON, CSSON and PLLON bits */

+  RCC->CR &= (uint32_t)0xFEF6FFFF;

+

+  /* Reset HSEBYP bit */

+  RCC->CR &= (uint32_t)0xFFFBFFFF;

+

+  /* Reset PLLSRC, PLLXTPRE, PLLMUL and USBPRE/OTGFSPRE bits */

+  RCC->CFGR &= (uint32_t)0xFF80FFFF;

+

+#ifdef STM32F10X_CL

+  /* Reset PLL2ON and PLL3ON bits */

+  RCC->CR &= (uint32_t)0xEBFFFFFF;

+

+  /* Disable all interrupts and clear pending bits  */

+  RCC->CIR = 0x00FF0000;

+

+  /* Reset CFGR2 register */

+  RCC->CFGR2 = 0x00000000;

+#elif defined (STM32F10X_LD_VL) || defined (STM32F10X_MD_VL) || (defined STM32F10X_HD_VL)

+  /* Disable all interrupts and clear pending bits  */

+  RCC->CIR = 0x009F0000;

+

+  /* Reset CFGR2 register */

+  RCC->CFGR2 = 0x00000000;      

+#else

+  /* Disable all interrupts and clear pending bits  */

+  RCC->CIR = 0x009F0000;

+#endif /* STM32F10X_CL */

+    

+#if defined (STM32F10X_HD) || (defined STM32F10X_XL) || (defined STM32F10X_HD_VL)

+  #ifdef DATA_IN_ExtSRAM

+    SystemInit_ExtMemCtl(); 

+  #endif /* DATA_IN_ExtSRAM */

+#endif 

+

+  /* Configure the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers */

+  /* Configure the Flash Latency cycles and enable prefetch buffer */

+  SetSysClock();

+

+#ifdef VECT_TAB_SRAM

+  SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */

+#else

+  SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */

+#endif 

+}

+

+/**

+  * @brief  Update SystemCoreClock variable according to Clock Register Values.

+  *         The SystemCoreClock variable contains the core clock (HCLK), it can

+  *         be used by the user application to setup the SysTick timer or configure

+  *         other parameters.

+  *           

+  * @note   Each time the core clock (HCLK) changes, this function must be called

+  *         to update SystemCoreClock variable value. Otherwise, any configuration

+  *         based on this variable will be incorrect.         

+  *     

+  * @note   - The system frequency computed by this function is not the real 

+  *           frequency in the chip. It is calculated based on the predefined 

+  *           constant and the selected clock source:

+  *             

+  *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(*)

+  *                                              

+  *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(**)

+  *                          

+  *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(**) 

+  *             or HSI_VALUE(*) multiplied by the PLL factors.

+  *         

+  *         (*) HSI_VALUE is a constant defined in stm32f1xx.h file (default value

+  *             8 MHz) but the real value may vary depending on the variations

+  *             in voltage and temperature.   

+  *    

+  *         (**) HSE_VALUE is a constant defined in stm32f1xx.h file (default value

+  *              8 MHz or 25 MHz, depedning on the product used), user has to ensure

+  *              that HSE_VALUE is same as the real frequency of the crystal used.

+  *              Otherwise, this function may have wrong result.

+  *                

+  *         - The result of this function could be not correct when using fractional

+  *           value for HSE crystal.

+  * @param  None

+  * @retval None

+  */

+void SystemCoreClockUpdate (void)

+{

+  uint32_t tmp = 0, pllmull = 0, pllsource = 0;

+

+#ifdef  STM32F10X_CL

+  uint32_t prediv1source = 0, prediv1factor = 0, prediv2factor = 0, pll2mull = 0;

+#endif /* STM32F10X_CL */

+

+#if defined (STM32F10X_LD_VL) || defined (STM32F10X_MD_VL) || (defined STM32F10X_HD_VL)

+  uint32_t prediv1factor = 0;

+#endif /* STM32F10X_LD_VL or STM32F10X_MD_VL or STM32F10X_HD_VL */

+    

+  /* Get SYSCLK source -------------------------------------------------------*/

+  tmp = RCC->CFGR & RCC_CFGR_SWS;

+  

+  switch (tmp)

+  {

+    case 0x00:  /* HSI used as system clock */

+      SystemCoreClock = HSI_VALUE;

+      break;

+    case 0x04:  /* HSE used as system clock */

+      SystemCoreClock = HSE_VALUE;

+      break;

+    case 0x08:  /* PLL used as system clock */

+

+      /* Get PLL clock source and multiplication factor ----------------------*/

+      pllmull = RCC->CFGR & RCC_CFGR_PLLMULL;

+      pllsource = RCC->CFGR & RCC_CFGR_PLLSRC;

+      

+#ifndef STM32F10X_CL      

+      pllmull = ( pllmull >> 18) + 2;

+      

+      if (pllsource == 0x00)

+      {

+        /* HSI oscillator clock divided by 2 selected as PLL clock entry */

+        SystemCoreClock = (HSI_VALUE >> 1) * pllmull;

+      }

+      else

+      {

+ #if defined (STM32F10X_LD_VL) || defined (STM32F10X_MD_VL) || (defined STM32F10X_HD_VL)

+       prediv1factor = (RCC->CFGR2 & RCC_CFGR2_PREDIV1) + 1;

+       /* HSE oscillator clock selected as PREDIV1 clock entry */

+       SystemCoreClock = (HSE_VALUE / prediv1factor) * pllmull; 

+ #else

+        /* HSE selected as PLL clock entry */

+        if ((RCC->CFGR & RCC_CFGR_PLLXTPRE) != (uint32_t)RESET)

+        {/* HSE oscillator clock divided by 2 */

+          SystemCoreClock = (HSE_VALUE >> 1) * pllmull;

+        }

+        else

+        {

+          SystemCoreClock = HSE_VALUE * pllmull;

+        }

+ #endif

+      }

+#else

+      pllmull = pllmull >> 18;

+      

+      if (pllmull != 0x0D)

+      {

+         pllmull += 2;

+      }

+      else

+      { /* PLL multiplication factor = PLL input clock * 6.5 */

+        pllmull = 13 / 2; 

+      }

+            

+      if (pllsource == 0x00)

+      {

+        /* HSI oscillator clock divided by 2 selected as PLL clock entry */

+        SystemCoreClock = (HSI_VALUE >> 1) * pllmull;

+      }

+      else

+      {/* PREDIV1 selected as PLL clock entry */

+        

+        /* Get PREDIV1 clock source and division factor */

+        prediv1source = RCC->CFGR2 & RCC_CFGR2_PREDIV1SRC;

+        prediv1factor = (RCC->CFGR2 & RCC_CFGR2_PREDIV1) + 1;

+        

+        if (prediv1source == 0)

+        { 

+          /* HSE oscillator clock selected as PREDIV1 clock entry */

+          SystemCoreClock = (HSE_VALUE / prediv1factor) * pllmull;          

+        }

+        else

+        {/* PLL2 clock selected as PREDIV1 clock entry */

+          

+          /* Get PREDIV2 division factor and PLL2 multiplication factor */

+          prediv2factor = ((RCC->CFGR2 & RCC_CFGR2_PREDIV2) >> 4) + 1;

+          pll2mull = ((RCC->CFGR2 & RCC_CFGR2_PLL2MUL) >> 8 ) + 2; 

+          SystemCoreClock = (((HSE_VALUE / prediv2factor) * pll2mull) / prediv1factor) * pllmull;                         

+        }

+      }

+#endif /* STM32F10X_CL */ 

+      break;

+

+    default:

+      SystemCoreClock = HSI_VALUE;

+      break;

+  }

+  

+  /* Compute HCLK clock frequency ----------------*/

+  /* Get HCLK prescaler */

+  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> 4)];

+  /* HCLK clock frequency */

+  SystemCoreClock >>= tmp;  

+}

+

+/**

+  * @brief  Configures the System clock frequency, HCLK, PCLK2 and PCLK1 prescalers.

+  * @param  None

+  * @retval None

+  */

+static void SetSysClock(void)

+{

+#ifdef SYSCLK_FREQ_HSE

+  SetSysClockToHSE();

+#elif defined SYSCLK_FREQ_24MHz

+  SetSysClockTo24();

+#elif defined SYSCLK_FREQ_36MHz

+  SetSysClockTo36();

+#elif defined SYSCLK_FREQ_48MHz

+  SetSysClockTo48();

+#elif defined SYSCLK_FREQ_56MHz

+  SetSysClockTo56();  

+#elif defined SYSCLK_FREQ_72MHz

+  SetSysClockTo72();

+#endif

+ 

+ /* If none of the define above is enabled, the HSI is used as System clock

+    source (default after reset) */ 

+}

+

+/**

+  * @brief  Setup the external memory controller. Called in startup_stm32f10x.s 

+  *          before jump to __main

+  * @param  None

+  * @retval None

+  */ 

+#ifdef DATA_IN_ExtSRAM

+/**

+  * @brief  Setup the external memory controller. 

+  *         Called in startup_stm32f10x_xx.s/.c before jump to main.

+  * 	      This function configures the external SRAM mounted on STM3210E-EVAL

+  *         board (STM32 High density devices). This SRAM will be used as program

+  *         data memory (including heap and stack).

+  * @param  None

+  * @retval None

+  */ 

+void SystemInit_ExtMemCtl(void) 

+{

+/*!< FSMC Bank1 NOR/SRAM3 is used for the STM3210E-EVAL, if another Bank is 

+  required, then adjust the Register Addresses */

+

+  /* Enable FSMC clock */

+  RCC->AHBENR = 0x00000114;

+  

+  /* Enable GPIOD, GPIOE, GPIOF and GPIOG clocks */  

+  RCC->APB2ENR = 0x000001E0;

+  

+/* ---------------  SRAM Data lines, NOE and NWE configuration ---------------*/

+/*----------------  SRAM Address lines configuration -------------------------*/

+/*----------------  NOE and NWE configuration --------------------------------*/  

+/*----------------  NE3 configuration ----------------------------------------*/

+/*----------------  NBL0, NBL1 configuration ---------------------------------*/

+  

+  GPIOD->CRL = 0x44BB44BB;  

+  GPIOD->CRH = 0xBBBBBBBB;

+

+  GPIOE->CRL = 0xB44444BB;  

+  GPIOE->CRH = 0xBBBBBBBB;

+

+  GPIOF->CRL = 0x44BBBBBB;  

+  GPIOF->CRH = 0xBBBB4444;

+

+  GPIOG->CRL = 0x44BBBBBB;  

+  GPIOG->CRH = 0x44444B44;

+   

+/*----------------  FSMC Configuration ---------------------------------------*/  

+/*----------------  Enable FSMC Bank1_SRAM Bank ------------------------------*/

+  

+  FSMC_Bank1->BTCR[4] = 0x00001011;

+  FSMC_Bank1->BTCR[5] = 0x00000200;

+}

+#endif /* DATA_IN_ExtSRAM */

+

+#ifdef SYSCLK_FREQ_HSE

+/**

+  * @brief  Selects HSE as System clock source and configure HCLK, PCLK2

+  *         and PCLK1 prescalers.

+  * @note   This function should be used only after reset.

+  * @param  None

+  * @retval None

+  */

+static void SetSysClockToHSE(void)

+{

+  __IO uint32_t StartUpCounter = 0, HSEStatus = 0;

+  

+  /* SYSCLK, HCLK, PCLK2 and PCLK1 configuration ---------------------------*/    

+  /* Enable HSE */    

+  RCC->CR |= ((uint32_t)RCC_CR_HSEON);

+ 

+  /* Wait till HSE is ready and if Time out is reached exit */

+  do

+  {

+    HSEStatus = RCC->CR & RCC_CR_HSERDY;

+    StartUpCounter++;  

+  } while((HSEStatus == 0) && (StartUpCounter != HSE_STARTUP_TIMEOUT));

+

+  if ((RCC->CR & RCC_CR_HSERDY) != RESET)

+  {

+    HSEStatus = (uint32_t)0x01;

+  }

+  else

+  {

+    HSEStatus = (uint32_t)0x00;

+  }  

+

+  if (HSEStatus == (uint32_t)0x01)

+  {

+

+#if !defined STM32F10X_LD_VL && !defined STM32F10X_MD_VL && !defined STM32F10X_HD_VL

+    /* Enable Prefetch Buffer */

+    FLASH->ACR |= FLASH_ACR_PRFTBE;

+

+    /* Flash 0 wait state */

+    FLASH->ACR &= (uint32_t)((uint32_t)~FLASH_ACR_LATENCY);

+

+#ifndef STM32F10X_CL

+    FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_0;

+#else

+    if (HSE_VALUE <= 24000000)

+	{

+      FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_0;

+	}

+	else

+	{

+      FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_1;

+	}

+#endif /* STM32F10X_CL */

+#endif

+ 

+    /* HCLK = SYSCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_HPRE_DIV1;

+      

+    /* PCLK2 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE2_DIV1;

+    

+    /* PCLK1 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE1_DIV1;

+    

+    /* Select HSE as system clock source */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_SW));

+    RCC->CFGR |= (uint32_t)RCC_CFGR_SW_HSE;    

+

+    /* Wait till HSE is used as system clock source */

+    while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS) != (uint32_t)0x04)

+    {

+    }

+  }

+  else

+  { /* If HSE fails to start-up, the application will have wrong clock 

+         configuration. User can add here some code to deal with this error */

+  }  

+}

+#elif defined SYSCLK_FREQ_24MHz

+/**

+  * @brief  Sets System clock frequency to 24MHz and configure HCLK, PCLK2 

+  *         and PCLK1 prescalers.

+  * @note   This function should be used only after reset.

+  * @param  None

+  * @retval None

+  */

+static void SetSysClockTo24(void)

+{

+  __IO uint32_t StartUpCounter = 0, HSEStatus = 0;

+  

+  /* SYSCLK, HCLK, PCLK2 and PCLK1 configuration ---------------------------*/    

+  /* Enable HSE */    

+  RCC->CR |= ((uint32_t)RCC_CR_HSEON);

+ 

+  /* Wait till HSE is ready and if Time out is reached exit */

+  do

+  {

+    HSEStatus = RCC->CR & RCC_CR_HSERDY;

+    StartUpCounter++;  

+  } while((HSEStatus == 0) && (StartUpCounter != HSE_STARTUP_TIMEOUT));

+

+  if ((RCC->CR & RCC_CR_HSERDY) != RESET)

+  {

+    HSEStatus = (uint32_t)0x01;

+  }

+  else

+  {

+    HSEStatus = (uint32_t)0x00;

+  }  

+

+  if (HSEStatus == (uint32_t)0x01)

+  {

+#if !defined STM32F10X_LD_VL && !defined STM32F10X_MD_VL && !defined STM32F10X_HD_VL 

+    /* Enable Prefetch Buffer */

+    FLASH->ACR |= FLASH_ACR_PRFTBE;

+

+    /* Flash 0 wait state */

+    FLASH->ACR &= (uint32_t)((uint32_t)~FLASH_ACR_LATENCY);

+    FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_0;    

+#endif

+ 

+    /* HCLK = SYSCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_HPRE_DIV1;

+      

+    /* PCLK2 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE2_DIV1;

+    

+    /* PCLK1 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE1_DIV1;

+    

+#ifdef STM32F10X_CL

+    /* Configure PLLs ------------------------------------------------------*/

+    /* PLL configuration: PLLCLK = PREDIV1 * 6 = 24 MHz */ 

+    RCC->CFGR &= (uint32_t)~(RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLSRC | RCC_CFGR_PLLMULL);

+    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLXTPRE_PREDIV1 | RCC_CFGR_PLLSRC_PREDIV1 | 

+                            RCC_CFGR_PLLMULL6); 

+

+    /* PLL2 configuration: PLL2CLK = (HSE / 5) * 8 = 40 MHz */

+    /* PREDIV1 configuration: PREDIV1CLK = PLL2 / 10 = 4 MHz */       

+    RCC->CFGR2 &= (uint32_t)~(RCC_CFGR2_PREDIV2 | RCC_CFGR2_PLL2MUL |

+                              RCC_CFGR2_PREDIV1 | RCC_CFGR2_PREDIV1SRC);

+    RCC->CFGR2 |= (uint32_t)(RCC_CFGR2_PREDIV2_DIV5 | RCC_CFGR2_PLL2MUL8 |

+                             RCC_CFGR2_PREDIV1SRC_PLL2 | RCC_CFGR2_PREDIV1_DIV10);

+  

+    /* Enable PLL2 */

+    RCC->CR |= RCC_CR_PLL2ON;

+    /* Wait till PLL2 is ready */

+    while((RCC->CR & RCC_CR_PLL2RDY) == 0)

+    {

+    }   

+#elif defined (STM32F10X_LD_VL) || defined (STM32F10X_MD_VL) || defined (STM32F10X_HD_VL)

+    /*  PLL configuration:  = (HSE / 2) * 6 = 24 MHz */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_PLLSRC | RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLMULL));

+    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLSRC_PREDIV1 | RCC_CFGR_PLLXTPRE_PREDIV1_Div2 | RCC_CFGR_PLLMULL6);

+#else    

+    /*  PLL configuration:  = (HSE / 2) * 6 = 24 MHz */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_PLLSRC | RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLMULL));

+    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLSRC_HSE | RCC_CFGR_PLLXTPRE_HSE_Div2 | RCC_CFGR_PLLMULL6);

+#endif /* STM32F10X_CL */

+

+    /* Enable PLL */

+    RCC->CR |= RCC_CR_PLLON;

+

+    /* Wait till PLL is ready */

+    while((RCC->CR & RCC_CR_PLLRDY) == 0)

+    {

+    }

+

+    /* Select PLL as system clock source */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_SW));

+    RCC->CFGR |= (uint32_t)RCC_CFGR_SW_PLL;    

+

+    /* Wait till PLL is used as system clock source */

+    while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS) != (uint32_t)0x08)

+    {

+    }

+  }

+  else

+  { /* If HSE fails to start-up, the application will have wrong clock 

+         configuration. User can add here some code to deal with this error */

+  } 

+}

+#elif defined SYSCLK_FREQ_36MHz

+/**

+  * @brief  Sets System clock frequency to 36MHz and configure HCLK, PCLK2 

+  *         and PCLK1 prescalers. 

+  * @note   This function should be used only after reset.

+  * @param  None

+  * @retval None

+  */

+static void SetSysClockTo36(void)

+{

+  __IO uint32_t StartUpCounter = 0, HSEStatus = 0;

+  

+  /* SYSCLK, HCLK, PCLK2 and PCLK1 configuration ---------------------------*/    

+  /* Enable HSE */    

+  RCC->CR |= ((uint32_t)RCC_CR_HSEON);

+ 

+  /* Wait till HSE is ready and if Time out is reached exit */

+  do

+  {

+    HSEStatus = RCC->CR & RCC_CR_HSERDY;

+    StartUpCounter++;  

+  } while((HSEStatus == 0) && (StartUpCounter != HSE_STARTUP_TIMEOUT));

+

+  if ((RCC->CR & RCC_CR_HSERDY) != RESET)

+  {

+    HSEStatus = (uint32_t)0x01;

+  }

+  else

+  {

+    HSEStatus = (uint32_t)0x00;

+  }  

+

+  if (HSEStatus == (uint32_t)0x01)

+  {

+    /* Enable Prefetch Buffer */

+    FLASH->ACR |= FLASH_ACR_PRFTBE;

+

+    /* Flash 1 wait state */

+    FLASH->ACR &= (uint32_t)((uint32_t)~FLASH_ACR_LATENCY);

+    FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_1;    

+ 

+    /* HCLK = SYSCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_HPRE_DIV1;

+      

+    /* PCLK2 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE2_DIV1;

+    

+    /* PCLK1 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE1_DIV1;

+    

+#ifdef STM32F10X_CL

+    /* Configure PLLs ------------------------------------------------------*/

+    

+    /* PLL configuration: PLLCLK = PREDIV1 * 9 = 36 MHz */ 

+    RCC->CFGR &= (uint32_t)~(RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLSRC | RCC_CFGR_PLLMULL);

+    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLXTPRE_PREDIV1 | RCC_CFGR_PLLSRC_PREDIV1 | 

+                            RCC_CFGR_PLLMULL9); 

+

+	/*!< PLL2 configuration: PLL2CLK = (HSE / 5) * 8 = 40 MHz */

+    /* PREDIV1 configuration: PREDIV1CLK = PLL2 / 10 = 4 MHz */

+        

+    RCC->CFGR2 &= (uint32_t)~(RCC_CFGR2_PREDIV2 | RCC_CFGR2_PLL2MUL |

+                              RCC_CFGR2_PREDIV1 | RCC_CFGR2_PREDIV1SRC);

+    RCC->CFGR2 |= (uint32_t)(RCC_CFGR2_PREDIV2_DIV5 | RCC_CFGR2_PLL2MUL8 |

+                             RCC_CFGR2_PREDIV1SRC_PLL2 | RCC_CFGR2_PREDIV1_DIV10);

+  

+    /* Enable PLL2 */

+    RCC->CR |= RCC_CR_PLL2ON;

+    /* Wait till PLL2 is ready */

+    while((RCC->CR & RCC_CR_PLL2RDY) == 0)

+    {

+    }

+    

+#else    

+    /*  PLL configuration: PLLCLK = (HSE / 2) * 9 = 36 MHz */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_PLLSRC | RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLMULL));

+    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLSRC_HSE | RCC_CFGR_PLLXTPRE_HSE_Div2 | RCC_CFGR_PLLMULL9);

+#endif /* STM32F10X_CL */

+

+    /* Enable PLL */

+    RCC->CR |= RCC_CR_PLLON;

+

+    /* Wait till PLL is ready */

+    while((RCC->CR & RCC_CR_PLLRDY) == 0)

+    {

+    }

+

+    /* Select PLL as system clock source */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_SW));

+    RCC->CFGR |= (uint32_t)RCC_CFGR_SW_PLL;    

+

+    /* Wait till PLL is used as system clock source */

+    while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS) != (uint32_t)0x08)

+    {

+    }

+  }

+  else

+  { /* If HSE fails to start-up, the application will have wrong clock 

+         configuration. User can add here some code to deal with this error */

+  } 

+}

+#elif defined SYSCLK_FREQ_48MHz

+/**

+  * @brief  Sets System clock frequency to 48MHz and configure HCLK, PCLK2 

+  *         and PCLK1 prescalers. 

+  * @note   This function should be used only after reset.

+  * @param  None

+  * @retval None

+  */

+static void SetSysClockTo48(void)

+{

+  __IO uint32_t StartUpCounter = 0, HSEStatus = 0;

+  

+  /* SYSCLK, HCLK, PCLK2 and PCLK1 configuration ---------------------------*/    

+  /* Enable HSE */    

+  RCC->CR |= ((uint32_t)RCC_CR_HSEON);

+ 

+  /* Wait till HSE is ready and if Time out is reached exit */

+  do

+  {

+    HSEStatus = RCC->CR & RCC_CR_HSERDY;

+    StartUpCounter++;  

+  } while((HSEStatus == 0) && (StartUpCounter != HSE_STARTUP_TIMEOUT));

+

+  if ((RCC->CR & RCC_CR_HSERDY) != RESET)

+  {

+    HSEStatus = (uint32_t)0x01;

+  }

+  else

+  {

+    HSEStatus = (uint32_t)0x00;

+  }  

+

+  if (HSEStatus == (uint32_t)0x01)

+  {

+    /* Enable Prefetch Buffer */

+    FLASH->ACR |= FLASH_ACR_PRFTBE;

+

+    /* Flash 1 wait state */

+    FLASH->ACR &= (uint32_t)((uint32_t)~FLASH_ACR_LATENCY);

+    FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_1;    

+ 

+    /* HCLK = SYSCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_HPRE_DIV1;

+      

+    /* PCLK2 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE2_DIV1;

+    

+    /* PCLK1 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE1_DIV2;

+    

+#ifdef STM32F10X_CL

+    /* Configure PLLs ------------------------------------------------------*/

+    /* PLL2 configuration: PLL2CLK = (HSE / 5) * 8 = 40 MHz */

+    /* PREDIV1 configuration: PREDIV1CLK = PLL2 / 5 = 8 MHz */

+        

+    RCC->CFGR2 &= (uint32_t)~(RCC_CFGR2_PREDIV2 | RCC_CFGR2_PLL2MUL |

+                              RCC_CFGR2_PREDIV1 | RCC_CFGR2_PREDIV1SRC);

+    RCC->CFGR2 |= (uint32_t)(RCC_CFGR2_PREDIV2_DIV5 | RCC_CFGR2_PLL2MUL8 |

+                             RCC_CFGR2_PREDIV1SRC_PLL2 | RCC_CFGR2_PREDIV1_DIV5);

+  

+    /* Enable PLL2 */

+    RCC->CR |= RCC_CR_PLL2ON;

+    /* Wait till PLL2 is ready */

+    while((RCC->CR & RCC_CR_PLL2RDY) == 0)

+    {

+    }

+    

+   

+    /* PLL configuration: PLLCLK = PREDIV1 * 6 = 48 MHz */ 

+    RCC->CFGR &= (uint32_t)~(RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLSRC | RCC_CFGR_PLLMULL);

+    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLXTPRE_PREDIV1 | RCC_CFGR_PLLSRC_PREDIV1 | 

+                            RCC_CFGR_PLLMULL6); 

+#else    

+    /*  PLL configuration: PLLCLK = HSE * 6 = 48 MHz */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_PLLSRC | RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLMULL));

+    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLSRC_HSE | RCC_CFGR_PLLMULL6);

+#endif /* STM32F10X_CL */

+

+    /* Enable PLL */

+    RCC->CR |= RCC_CR_PLLON;

+

+    /* Wait till PLL is ready */

+    while((RCC->CR & RCC_CR_PLLRDY) == 0)

+    {

+    }

+

+    /* Select PLL as system clock source */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_SW));

+    RCC->CFGR |= (uint32_t)RCC_CFGR_SW_PLL;    

+

+    /* Wait till PLL is used as system clock source */

+    while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS) != (uint32_t)0x08)

+    {

+    }

+  }

+  else

+  { /* If HSE fails to start-up, the application will have wrong clock 

+         configuration. User can add here some code to deal with this error */

+  } 

+}

+

+#elif defined SYSCLK_FREQ_56MHz

+/**

+  * @brief  Sets System clock frequency to 56MHz and configure HCLK, PCLK2 

+  *         and PCLK1 prescalers. 

+  * @note   This function should be used only after reset.

+  * @param  None

+  * @retval None

+  */

+static void SetSysClockTo56(void)

+{

+  __IO uint32_t StartUpCounter = 0, HSEStatus = 0;

+  

+  /* SYSCLK, HCLK, PCLK2 and PCLK1 configuration ---------------------------*/   

+  /* Enable HSE */    

+  RCC->CR |= ((uint32_t)RCC_CR_HSEON);

+ 

+  /* Wait till HSE is ready and if Time out is reached exit */

+  do

+  {

+    HSEStatus = RCC->CR & RCC_CR_HSERDY;

+    StartUpCounter++;  

+  } while((HSEStatus == 0) && (StartUpCounter != HSE_STARTUP_TIMEOUT));

+

+  if ((RCC->CR & RCC_CR_HSERDY) != RESET)

+  {

+    HSEStatus = (uint32_t)0x01;

+  }

+  else

+  {

+    HSEStatus = (uint32_t)0x00;

+  }  

+

+  if (HSEStatus == (uint32_t)0x01)

+  {

+    /* Enable Prefetch Buffer */

+    FLASH->ACR |= FLASH_ACR_PRFTBE;

+

+    /* Flash 2 wait state */

+    FLASH->ACR &= (uint32_t)((uint32_t)~FLASH_ACR_LATENCY);

+    FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_2;    

+ 

+    /* HCLK = SYSCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_HPRE_DIV1;

+      

+    /* PCLK2 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE2_DIV1;

+    

+    /* PCLK1 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE1_DIV2;

+

+#ifdef STM32F10X_CL

+    /* Configure PLLs ------------------------------------------------------*/

+    /* PLL2 configuration: PLL2CLK = (HSE / 5) * 8 = 40 MHz */

+    /* PREDIV1 configuration: PREDIV1CLK = PLL2 / 5 = 8 MHz */

+        

+    RCC->CFGR2 &= (uint32_t)~(RCC_CFGR2_PREDIV2 | RCC_CFGR2_PLL2MUL |

+                              RCC_CFGR2_PREDIV1 | RCC_CFGR2_PREDIV1SRC);

+    RCC->CFGR2 |= (uint32_t)(RCC_CFGR2_PREDIV2_DIV5 | RCC_CFGR2_PLL2MUL8 |

+                             RCC_CFGR2_PREDIV1SRC_PLL2 | RCC_CFGR2_PREDIV1_DIV5);

+  

+    /* Enable PLL2 */

+    RCC->CR |= RCC_CR_PLL2ON;

+    /* Wait till PLL2 is ready */

+    while((RCC->CR & RCC_CR_PLL2RDY) == 0)

+    {

+    }

+    

+   

+    /* PLL configuration: PLLCLK = PREDIV1 * 7 = 56 MHz */ 

+    RCC->CFGR &= (uint32_t)~(RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLSRC | RCC_CFGR_PLLMULL);

+    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLXTPRE_PREDIV1 | RCC_CFGR_PLLSRC_PREDIV1 | 

+                            RCC_CFGR_PLLMULL7); 

+#else     

+    /* PLL configuration: PLLCLK = HSE * 7 = 56 MHz */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_PLLSRC | RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLMULL));

+    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLSRC_HSE | RCC_CFGR_PLLMULL7);

+

+#endif /* STM32F10X_CL */

+

+    /* Enable PLL */

+    RCC->CR |= RCC_CR_PLLON;

+

+    /* Wait till PLL is ready */

+    while((RCC->CR & RCC_CR_PLLRDY) == 0)

+    {

+    }

+

+    /* Select PLL as system clock source */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_SW));

+    RCC->CFGR |= (uint32_t)RCC_CFGR_SW_PLL;    

+

+    /* Wait till PLL is used as system clock source */

+    while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS) != (uint32_t)0x08)

+    {

+    }

+  }

+  else

+  { /* If HSE fails to start-up, the application will have wrong clock 

+         configuration. User can add here some code to deal with this error */

+  } 

+}

+

+#elif defined SYSCLK_FREQ_72MHz

+/**

+  * @brief  Sets System clock frequency to 72MHz and configure HCLK, PCLK2 

+  *         and PCLK1 prescalers. 

+  * @note   This function should be used only after reset.

+  * @param  None

+  * @retval None

+  */

+static void SetSysClockTo72(void)

+{

+  __IO uint32_t StartUpCounter = 0, HSEStatus = 0;

+  

+  /* SYSCLK, HCLK, PCLK2 and PCLK1 configuration ---------------------------*/    

+  /* Enable HSE */    

+  RCC->CR |= ((uint32_t)RCC_CR_HSEON);

+ 

+  /* Wait till HSE is ready and if Time out is reached exit */

+  do

+  {

+    HSEStatus = RCC->CR & RCC_CR_HSERDY;

+    StartUpCounter++;  

+  } while((HSEStatus == 0) && (StartUpCounter != HSE_STARTUP_TIMEOUT));

+

+  if ((RCC->CR & RCC_CR_HSERDY) != RESET)

+  {

+    HSEStatus = (uint32_t)0x01;

+  }

+  else

+  {

+    HSEStatus = (uint32_t)0x00;

+  }  

+

+  if (HSEStatus == (uint32_t)0x01)

+  {

+    /* Enable Prefetch Buffer */

+    FLASH->ACR |= FLASH_ACR_PRFTBE;

+

+    /* Flash 2 wait state */

+    FLASH->ACR &= (uint32_t)((uint32_t)~FLASH_ACR_LATENCY);

+    FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_2;    

+

+ 

+    /* HCLK = SYSCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_HPRE_DIV1;

+      

+    /* PCLK2 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE2_DIV1;

+    

+    /* PCLK1 = HCLK */

+    RCC->CFGR |= (uint32_t)RCC_CFGR_PPRE1_DIV2;

+

+#ifdef STM32F10X_CL

+    /* Configure PLLs ------------------------------------------------------*/

+    /* PLL2 configuration: PLL2CLK = (HSE / 5) * 8 = 40 MHz */

+    /* PREDIV1 configuration: PREDIV1CLK = PLL2 / 5 = 8 MHz */

+        

+    RCC->CFGR2 &= (uint32_t)~(RCC_CFGR2_PREDIV2 | RCC_CFGR2_PLL2MUL |

+                              RCC_CFGR2_PREDIV1 | RCC_CFGR2_PREDIV1SRC);

+    RCC->CFGR2 |= (uint32_t)(RCC_CFGR2_PREDIV2_DIV5 | RCC_CFGR2_PLL2MUL8 |

+                             RCC_CFGR2_PREDIV1SRC_PLL2 | RCC_CFGR2_PREDIV1_DIV5);

+  

+    /* Enable PLL2 */

+    RCC->CR |= RCC_CR_PLL2ON;

+    /* Wait till PLL2 is ready */

+    while((RCC->CR & RCC_CR_PLL2RDY) == 0)

+    {

+    }

+    

+   

+    /* PLL configuration: PLLCLK = PREDIV1 * 9 = 72 MHz */ 

+    RCC->CFGR &= (uint32_t)~(RCC_CFGR_PLLXTPRE | RCC_CFGR_PLLSRC | RCC_CFGR_PLLMULL);

+    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLXTPRE_PREDIV1 | RCC_CFGR_PLLSRC_PREDIV1 | 

+                            RCC_CFGR_PLLMULL9); 

+#else    

+    /*  PLL configuration: PLLCLK = HSE * 9 = 72 MHz */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_PLLSRC | RCC_CFGR_PLLXTPRE |

+                                        RCC_CFGR_PLLMULL));

+    RCC->CFGR |= (uint32_t)(RCC_CFGR_PLLSRC_HSE | RCC_CFGR_PLLMULL9);

+#endif /* STM32F10X_CL */

+

+    /* Enable PLL */

+    RCC->CR |= RCC_CR_PLLON;

+

+    /* Wait till PLL is ready */

+    while((RCC->CR & RCC_CR_PLLRDY) == 0)

+    {

+    }

+    

+    /* Select PLL as system clock source */

+    RCC->CFGR &= (uint32_t)((uint32_t)~(RCC_CFGR_SW));

+    RCC->CFGR |= (uint32_t)RCC_CFGR_SW_PLL;    

+

+    /* Wait till PLL is used as system clock source */

+    while ((RCC->CFGR & (uint32_t)RCC_CFGR_SWS) != (uint32_t)0x08)

+    {

+    }

+  }

+  else

+  { /* If HSE fails to start-up, the application will have wrong clock 

+         configuration. User can add here some code to deal with this error */

+  }

+}

+#endif

+

+/**

+  * @}

+  */

+

+/**

+  * @}

+  */

+  

+/**

+  * @}

+  */    

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 6 - 5
bsp/stm32f10x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
查看文件 

@@ -2,10 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    system_stm32f10x.h

   * @file    system_stm32f10x.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   CMSIS Cortex-M3 Device Peripheral Access Layer System Header File.

   * @brief   CMSIS Cortex-M3 Device Peripheral Access Layer System Header File.

-  ******************************************************************************  

+  ******************************************************************************

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -14,7 +15,7 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

   ******************************************************************************

   ******************************************************************************

   */

   */

 

 

@@ -94,4 +95,4 @@ extern void SystemCoreClockUpdate(void);
 
 /**

 /**

   * @}

   * @}

   */  

   */  

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 342 - 0
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/Release_Notes.html
查看文件 

@@ -0,0 +1,342 @@
 
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

+<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"><head>

+

+

+

+

+

+

+

+

+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

+<link rel="File-List" href="Library_files/filelist.xml">

+<link rel="Edit-Time-Data" href="Library_files/editdata.mso"><!--[if !mso]> <style> v\:* {behavior:url(#default#VML);} o\:* {behavior:url(#default#VML);} w\:* {behavior:url(#default#VML);} .shape {behavior:url(#default#VML);} </style> <![endif]--><title>Release Notes for STM32F10x Standard Peripherals Library Drivers</title><!--[if gte mso 9]><xml> <o:DocumentProperties> <o:Author>STMicroelectronics</o:Author> <o:LastAuthor>STMicroelectronics</o:LastAuthor> <o:Revision>37</o:Revision> <o:TotalTime>136</o:TotalTime> <o:Created>2009-02-27T19:26:00Z</o:Created> <o:LastSaved>2009-03-01T17:56:00Z</o:LastSaved> <o:Pages>1</o:Pages> <o:Words>522</o:Words> <o:Characters>2977</o:Characters> <o:Company>STMicroelectronics</o:Company> <o:Lines>24</o:Lines> <o:Paragraphs>6</o:Paragraphs> <o:CharactersWithSpaces>3493</o:CharactersWithSpaces> <o:Version>11.6568</o:Version> </o:DocumentProperties> </xml><![endif]--><!--[if gte mso 9]><xml> <w:WordDocument> <w:Zoom>110</w:Zoom> <w:ValidateAgainstSchemas/> <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid> <w:IgnoreMixedContent>false</w:IgnoreMixedContent> <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText> <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel> </w:WordDocument> </xml><![endif]--><!--[if gte mso 9]><xml> <w:LatentStyles DefLockedState="false" LatentStyleCount="156"> </w:LatentStyles> </xml><![endif]-->

+

+

+

+<style>

+<!--

+/* Style Definitions */

+p.MsoNormal, li.MsoNormal, div.MsoNormal

+{mso-style-parent:"";

+margin:0in;

+margin-bottom:.0001pt;

+mso-pagination:widow-orphan;

+font-size:12.0pt;

+font-family:"Times New Roman";

+mso-fareast-font-family:"Times New Roman";}

+h2

+{mso-style-next:Normal;

+margin-top:12.0pt;

+margin-right:0in;

+margin-bottom:3.0pt;

+margin-left:0in;

+mso-pagination:widow-orphan;

+page-break-after:avoid;

+mso-outline-level:2;

+font-size:14.0pt;

+font-family:Arial;

+font-weight:bold;

+font-style:italic;}

+a:link, span.MsoHyperlink

+{color:blue;

+text-decoration:underline;

+text-underline:single;}

+a:visited, span.MsoHyperlinkFollowed

+{color:blue;

+text-decoration:underline;

+text-underline:single;}

+p

+{mso-margin-top-alt:auto;

+margin-right:0in;

+mso-margin-bottom-alt:auto;

+margin-left:0in;

+mso-pagination:widow-orphan;

+font-size:12.0pt;

+font-family:"Times New Roman";

+mso-fareast-font-family:"Times New Roman";}

+@page Section1

+{size:8.5in 11.0in;

+margin:1.0in 1.25in 1.0in 1.25in;

+mso-header-margin:.5in;

+mso-footer-margin:.5in;

+mso-paper-source:0;}

+div.Section1

+{page:Section1;}

+-->

+</style><!--[if gte mso 10]> <style> /* Style Definitions */ table.MsoNormalTable {mso-style-name:"Table Normal"; mso-tstyle-rowband-size:0; mso-tstyle-colband-size:0; mso-style-noshow:yes; mso-style-parent:""; mso-padding-alt:0in 5.4pt 0in 5.4pt; mso-para-margin:0in; mso-para-margin-bottom:.0001pt; mso-pagination:widow-orphan; font-size:10.0pt; font-family:"Times New Roman"; mso-ansi-language:#0400; mso-fareast-language:#0400; mso-bidi-language:#0400;} </style> <![endif]--><!--[if gte mso 9]><xml> <o:shapedefaults v:ext="edit" spidmax="5122"/> </xml><![endif]--><!--[if gte mso 9]><xml> <o:shapelayout v:ext="edit"> <o:idmap v:ext="edit" data="1"/> </o:shapelayout></xml><![endif]--></head>

+<body lang="EN-US" link="blue" vlink="blue">

+<div class="Section1">

+<p class="MsoNormal"><span style="font-family: Arial;"><o:p><br>

+</o:p></span></p>

+<div align="center">

+<table class="MsoNormalTable" style="width: 675pt;" border="0" cellpadding="0" cellspacing="0" width="900">

+<tbody>

+<tr style="">

+<td style="padding: 0cm;" valign="top">

+<table class="MsoNormalTable" style="width: 675pt;" border="0" cellpadding="0" cellspacing="0" width="900">

+<tbody>

+          <tr>

+            <td style="vertical-align: top;"><span style="font-size: 8pt; font-family: Arial; color: blue;"><a href="../../Release_Notes.html">Back to Release page</a></span></td>

+          </tr>

+<tr style="">

+<td style="padding: 1.5pt;">

+<h1 style="margin-bottom: 18pt; text-align: center;" align="center"><span style="font-size: 20pt; font-family: Verdana; color: rgb(51, 102, 255);">Release

+Notes for STM32F10x Standard Peripherals Library Drivers

+(StdPeriph_Driver)</span><span style="font-size: 20pt; font-family: Verdana;"><o:p></o:p></span></h1>

+<p class="MsoNormal" style="text-align: center;" align="center"><span style="font-size: 10pt; font-family: Arial; color: black;">Copyright 2011 STMicroelectronics</span><span style="color: black;"><u1:p></u1:p><o:p></o:p></span></p>

+<p class="MsoNormal" style="text-align: center;" align="center"><span style="font-size: 10pt; font-family: Arial; color: black;"><img alt="" id="_x0000_i1025" src="../../_htmresc/logo.bmp" style="border: 0px solid ; width: 86px; height: 65px;"></span><span style="font-size: 10pt;"><o:p></o:p></span></p>

+</td>

+</tr>

+</tbody>

+</table>

+<p class="MsoNormal"><span style="font-family: Arial; display: none;"><o:p>&nbsp;</o:p></span></p>

+<table class="MsoNormalTable" style="width: 675pt;" border="0" cellpadding="0" width="900">

+<tbody>

+<tr>

+<td style="padding: 0cm;" valign="top">

+<h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><span style="font-size: 12pt; color: white;">Contents<o:p></o:p></span></h2>

+<ol style="margin-top: 0cm;" start="1" type="1">

+<li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;"><a href="#History">STM32F10x Standard Peripherals Library

+Drivers update History</a><o:p></o:p></span></li>

+<li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;"><a href="#License">License</a><o:p></o:p></span></li>

+</ol>

+<span style="font-family: &quot;Times New Roman&quot;;">

+</span>

+<h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><a name="History"></a><span style="font-size: 12pt; color: white;">STM32F10x Standard

+Peripherals Library Drivers&nbsp; update History</span></h2><br>

+            <h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 500pt; width: 167px;"><span style="font-size: 10pt; font-family: Arial; color: white;">V3.5.0 / 11-March-2011<o:p></o:p></span></h3>

+            <p class="MsoNormal" style="margin: 4.5pt 0cm 4.5pt 18pt;"><b style=""><u><span style="font-size: 10pt; font-family: Verdana; color: black;">Main

+Changes<o:p></o:p></span></u></b></p>

+

+            <ul style="margin-top: 0cm;" type="square">

+<li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_can.h/.c files:</span></li>

+              <ul>

+                <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">Add 5 new functions</span></li>

+                <ul>

+                  <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">3

+new functions controlling the counter errors: CAN_GetLastErrorCode(),

+CAN_GetReceiveErrorCounter() and CAN_GetLSBTransmitErrorCounter().</span></li>

+                </ul>

+                <ul>

+                  <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">1 new function to select the CAN operating mode: CAN_OperatingModeRequest().</span></li>

+                </ul>

+                <ul>

+                  <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">1 new function to support CAN TT mode: CAN_TTComModeCmd().</span><span style="font-size: 10pt; font-family: Verdana;"><br>

+  </span></li>

+                </ul>

+                <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">CAN_TransmitStatus() function updated to support all CAN transmit intermediate states<br>

+                  </span></li>

+              </ul>

+              <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_i2c.h/.c files:</span></li>

+              <ul>

+                <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">Add 1 new function:</span></li>

+                <ul>

+                  <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">I2C_NACKPositionConfig():

+This function configures the same bit (POS) as I2C_PECPositionConfig()

+but is intended to be used in I2C mode while I2C_PECPositionConfig() is

+intended to used in SMBUS mode.</span></li>

+                </ul>

+              </ul>

+              <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_tim.h/.c files:</span></li>

+              <ul>

+                <li class="MsoNormal" style="color: black; margin-top: 4.5pt; margin-bottom: 4.5pt;"><span style="font-size: 10pt; font-family: Verdana;">Change the <span style="font-style: italic;">TIM_DMABurstLength_xBytes</span> definitions to <span style="font-style: italic;">TIM_DMABurstLength_xTansfers</span><br>

+                  </span></li>

+              </ul>

+

+

+            </ul>

+

+            <h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 558.05pt;"><span style="font-size: 10pt; font-family: Arial; color: white;">3.4.0

+- 10/15/2010</span></h3>

+

+            <ol style="margin-top: 0in;" start="1" type="1">

+<li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">General</span></i></b><i><span style="font-size: 10pt; font-family: Verdana;"> </span></i><i><span style="font-size: 10pt;"><o:p></o:p></span></i></li>

+            </ol>

+

+            <ul style="margin-top: 0in;" type="disc">

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add support for <span style="font-weight: bold;">STM32F10x High-density value line </span>devices.</span></li>

+            </ul>

+

+            <ol style="margin-top: 0in;" start="2" type="1">

+<li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">STM32F10x_StdPeriph_Driver</span></i></b><b><i><span style="font-size: 10pt;"><o:p></o:p></span></i></b></li>

+            </ol>

+

+            

+            <ul style="margin-top: 0in;" type="disc">

+

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_bkp.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete BKP registers definition from stm32f10x_bkp.c and use defines within stm32f10x.h file. </span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_can.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete CAN registers definition from stm32f10x_can.c and use defines within stm32f10x.h file.<br>

+</span></span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Update the wording of some defines and Asserts macro. <br>

+                  </span></span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">CAN_GetFlagStatus()

+and CAN_ClearFlag() functions: updated to support new flags (were not

+supported in previous version). These flags are:&nbsp; CAN_FLAG_RQCP0,

+CAN_FLAG_RQCP1, CAN_FLAG_RQCP2, CAN_FLAG_FMP1, CAN_FLAG_FF1,

+CAN_FLAG_FOV1, CAN_FLAG_FMP0, CAN_FLAG_FF0,&nbsp;&nbsp; CAN_FLAG_FOV0,

+CAN_FLAG_WKU, CAN_FLAG_SLAK and CAN_FLAG_LEC. <br>

+                  </span></span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">CAN_GetITStatus()

+function: add a check of the interrupt enable bit before getting the

+status of corresponding interrupt pending bit. <br>

+                  </span></span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">CAN_ClearITPendingBit() function: correct the procedure to clear the interrupt pending bit. <br>

+                  </span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_crc.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete CRC registers definition from stm32f10x_crc.c and use defines within stm32f10x.h file.</span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_dac.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete DAC registers definition from stm32f10x_dac.c and use defines within stm32f10x.h file. </span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_dbgmcu.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete DBGMCU registers definition from stm32f10x_dbgmcu.c and use defines within stm32f10x.h file. </span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_dma.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete DMA registers definition from stm32f10x_dma.c and use defines within stm32f10x.h file.</span></span></li>

+                <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Add new function "void DMA_SetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx, uint16_t DataNumber);"<br>

+                  </span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_flash.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">FLASH functions (Erase and Program) updated to always clear the "PG", "MER" and "PER" bits even in case of TimeOut Error.</span><span style="font-style: italic;"></span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_fsmc.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Add new member "FSMC_AsynchronousWait" in "FSMC_NORSRAMInitTypeDef" structure.</span><span style="font-style: italic;"></span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_gpio.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">GPIO_PinRemapConfig()</span> function: add new values for <span style="font-style: italic;">GPIO_Remap</span> parameter, to support new <span style="font-style: italic;">remap for TIM6, TIM7 and DAC DMA requests, TIM12 and DAC Triggers / DMA2_Channel5 Interrupt mapping.</span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_pwr.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete PWR registers definition from stm32f10x_pwr.c and use defines within stm32f10x.h and core_cm3.h files.</span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_rtc.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Delete RTC registers definition from stm32f10x_rtc.c and use defines within stm32f10x.h file.</span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_spi.h/.c</span></li>

+              <ul>

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Add new definition for I2S Audio Clock frequencies "I2S_AudioFreq_192k".</span></span></li>

+              </ul>

+              <li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_tim.h/.c</span></li>

+<ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">Add new definition for TIM Input Capture Polarity "TIM_ICPolarity_BothEdge".</span></span></li></ul>

+            

+            </ul>

+

+            <h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 558.05pt;"><span style="font-size: 10pt; font-family: Arial; color: white;">3.3.0

+- 04/16/2010</span></h3>

+

+<ol style="margin-top: 0in;" start="1" type="1"><li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">General</span></i></b><i><span style="font-size: 10pt; font-family: Verdana;"> </span></i><i><span style="font-size: 10pt;"><o:p></o:p></span></i></li></ol>

+<ul style="margin-top: 0in;" type="disc"><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add support for <span style="font-weight: bold;">STM32F10x XL-density </span>devices.</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">I2C driver: events description and management enhancement.</span></li></ul>

+<ol style="margin-top: 0in;" start="2" type="1"><li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">STM32F10x_StdPeriph_Driver</span></i></b><b><i><span style="font-size: 10pt;"><o:p></o:p></span></i></b></li></ol>

+<ul style="margin-top: 0in;" type="disc"><li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_dbgmcu.h/.c</span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">DBGMCU_Config()</span> function: add new values <span style="font-style: italic;">DBGMCU_TIMx_STOP</span> (x: 9..14) for <span style="font-style: italic;">DBGMCU_Periph</span> parameter.</span></li></ul><li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_flash.h/.c:

+updated to support Bank2 of XL-density devices (up to 1MByte of Flash

+memory). For more details, refer to the description provided within

+stm32f10x_flash.c file.</span></li><li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_gpio.h/.c</span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">GPIO_PinRemapConfig()</span> function: add new values for <span style="font-style: italic;">GPIO_Remap</span> parameter, to support new <span style="font-style: italic;">remap for FSMC_NADV pin and TIM9..11,13,14.</span></span></li></ul><li class="MsoNormal"><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_i2c.h/.c: I2C events description and management enhancement. <br></span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;"><span style="font-style: italic;">I2C_CheckEvent()</span>

+function: updated to check whether the last event contains the

+I2C_EVENT&nbsp; (instead of check whether the last event is equal to

+I2C_EVENT)<br></span></li></ul><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add

+detailed description of I2C events and how to manage them using the

+functions provided by this driver. For more information, refer to

+stm32f10x_i2c.h and stm32f10x_i2c.c files.</span></li></ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_rcc.h/.c: updated to support TIM9..TIM14 APB clock and reset configuration</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_tim.h/.c: updated to support new Timers TIM9..TIM14.</span></li><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">stm32f10x_sdio.h:&nbsp;</span></li><ul><li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">SDIO_SetSDIOReadWaitMode() function: correct values of SDIO_ReadWaitMode parameter<br>change <br>&nbsp;

+#define

+SDIO_ReadWaitMode_CLK&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&nbsp; ((uint32_t)0x00000000)<br>&nbsp; #define

+SDIO_ReadWaitMode_DATA2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+((uint32_t)0x00000001)<br>by<br>&nbsp; #define

+SDIO_ReadWaitMode_CLK&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+&nbsp; ((uint32_t)0x00000001)<br>&nbsp; #define

+SDIO_ReadWaitMode_DATA2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+((uint32_t)0x00000000)</span></li></ul></ul>

+<h3 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial; margin-right: 558.05pt;"><span style="font-size: 10pt; font-family: Arial; color: white;">3.2.0

+- 03/01/2010</span></h3>

+<ol style="margin-top: 0in;" start="1" type="1">

+<li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">General</span></i></b><i><span style="font-size: 10pt; font-family: Verdana;"> </span></i><i><span style="font-size: 10pt;"><o:p></o:p></span></i></li>

+</ol>

+<ul style="margin-top: 0in;" type="disc">

+

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add support

+for&nbsp;<b>STM32 Low-density Value line (STM32F100x4/6) and

+Medium-density Value line (STM32F100x8/B) devices</b>.</span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Almost

+peripherals drivers were updated to support Value

+line devices features</span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Drivers limitations fix and enhancements. </span><span style="font-size: 10pt;"><o:p></o:p></span></li>

+

+</ul>

+<ol style="margin-top: 0in;" start="2" type="1">

+<li class="MsoNormal" style=""><b><i><span style="font-size: 10pt; font-family: Verdana;">STM32F10x_StdPeriph_Driver</span></i></b><b><i><span style="font-size: 10pt;"><o:p></o:p></span></i></b></li>

+</ol>

+<ul style="margin-top: 0in;" type="disc">

+<li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Add new

+firmware driver for CEC peripheral: stm32f10x_cec.h and stm32f10x_cec.c</span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">Timers drivers stm32f10x_tim.h/.c: add support for new General Purpose Timers: TIM15, TIM16 and TIM17.</span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">RCC driver: add support for new Value peripherals: HDMI-CEC, TIM15, TIM16 and TIM17.</span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">GPIO driver: add new remap parameters for TIM1, TIM15, TIM16, TIM17 and HDMI-CEC: </span><span style="font-size: 10pt; font-family: Verdana;">GPIO_Remap_TIM1_DMA, </span><span style="font-size: 10pt; font-family: Verdana;">GPIO_Remap_TIM15, GPIO_Remap_TIM16, GPIO_Remap_TIM17, GPIO_Remap_CEC.</span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">USART

+driver: add support for Oversampling by 8 mode and onebit method. 2

+functions has been added: USART_OverSampling8Cmd() and

+USART_OneBitMethodCmd().<br>

+                </span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">DAC

+driver: add new functions handling the DAC under run feature:

+DAC_ITConfig(), DAC_GetFlagStatus(), DAC_ClearFlag(), DAC_GetITStatus()

+and DAC_ClearITPendingBit().</span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">DBGMCU driver: add new parameters for TIM15, TIM16 and TIM17: DBGMCU_TIM15_STOP, DBGMCU_TIM16_STOP, DBGMCU_TIM17_STOP.<br>

+                </span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">FLASH

+driver: the FLASH_EraseOptionBytes() function updated. This is now just

+erasing the option bytes without modifying the RDP status either

+enabled or disabled.</span></li>

+              <li class="MsoNormal" style=""><span style="font-size: 10pt; font-family: Verdana;">PWR

+driver: the PWR_EnterSTOPMode() function updated. When woken up from

+STOP mode, this function resets again the SLEEPDEEP bit in the

+Cortex-M3 System Control register to allow Sleep mode entering.</span></li>

+              

+

+</ul>

+<h2 style="background: rgb(51, 102, 255) none repeat scroll 0% 50%; -moz-background-clip: initial; -moz-background-origin: initial; -moz-background-inline-policy: initial;"><a name="License"></a><span style="font-size: 12pt; color: white;">License<o:p></o:p></span></h2>

+<p class="MsoNormal" style="margin: 4.5pt 0cm;"><span style="font-size: 10pt; font-family: Verdana; color: black;">The

+enclosed firmware and all the related documentation are not covered by

+a License Agreement, if you need such License you can contact your

+local STMicroelectronics office.<u1:p></u1:p><o:p></o:p></span></p>

+<p class="MsoNormal"><b style=""><span style="font-size: 10pt; font-family: Verdana; color: black;">THE

+PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

+WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO

+SAVE TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR

+ANY DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY

+CLAIMS ARISING FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY

+CUSTOMERS OF THE CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH

+THEIR PRODUCTS. <o:p></o:p></span></b></p>

+<p class="MsoNormal"><span style="color: black;"><o:p>&nbsp;</o:p></span></p>

+<div class="MsoNormal" style="text-align: center;" align="center"><span style="color: black;">

+<hr align="center" size="2" width="100%"></span></div>

+<p class="MsoNormal" style="margin: 4.5pt 0cm 4.5pt 18pt; text-align: center;" align="center"><span style="font-size: 10pt; font-family: Verdana; color: black;">For

+complete documentation on </span><span style="font-size: 10pt; font-family: Verdana;">STM32(<span style="color: black;">CORTEX M3) 32-Bit Microcontrollers

+visit </span><u><span style="color: blue;"><a href="http://www.st.com/stm32" target="_blank">www.st.com/STM32</a></span></u></span><span style="color: black;"><o:p></o:p></span></p>

+</td>

+</tr>

+</tbody>

+</table>

+<p class="MsoNormal"><span style="font-size: 10pt;"><o:p></o:p></span></p>

+</td>

+</tr>

+</tbody>

+</table>

+</div>

+<p class="MsoNormal"><o:p>&nbsp;</o:p></p>

+</div>

+</body></html>

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    misc.h

   * @file    misc.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the miscellaneous

   * @brief   This file contains all the functions prototypes for the miscellaneous

   *          firmware library functions (add-on to CMSIS functions).

   *          firmware library functions (add-on to CMSIS functions).

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __MISC_H

 #ifndef __MISC_H

@@ -216,4 +217,4 @@ void SysTick_CLKSourceConfig(uint32_t SysTick_CLKSource);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_adc.h

   * @file    stm32f10x_adc.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the ADC firmware 

   * @brief   This file contains all the functions prototypes for the ADC firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_ADC_H

 #ifndef __STM32F10x_ADC_H

@@ -479,4 +480,4 @@ void ADC_ClearITPendingBit(ADC_TypeDef* ADCx, uint16_t ADC_IT);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_bkp.h

   * @file    stm32f10x_bkp.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the BKP firmware 

   * @brief   This file contains all the functions prototypes for the BKP firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_BKP_H

 #ifndef __STM32F10x_BKP_H

@@ -191,4 +192,4 @@ void BKP_ClearITPendingBit(void);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 206 - 92
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_can.h

   * @file    stm32f10x_can.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the CAN firmware 

   * @brief   This file contains all the functions prototypes for the CAN firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_CAN_H

 #ifndef __STM32F10x_CAN_H

@@ -51,38 +52,51 @@
 
 

 

 typedef struct

 typedef struct

 {

 {

-  uint16_t CAN_Prescaler;   /*!< Specifies the length of a time quantum. It ranges from 1 to 1024. */

+  uint16_t CAN_Prescaler;   /*!< Specifies the length of a time quantum. 

+                                 It ranges from 1 to 1024. */

   

   

   uint8_t CAN_Mode;         /*!< Specifies the CAN operating mode.

   uint8_t CAN_Mode;         /*!< Specifies the CAN operating mode.

-                                 This parameter can be a value of @ref CAN_operating_mode */

-

-  uint8_t CAN_SJW;          /*!< Specifies the maximum number of time quanta the CAN hardware

-                                 is allowed to lengthen or shorten a bit to perform resynchronization.

-                                 This parameter can be a value of @ref CAN_synchronisation_jump_width */

-

-  uint8_t CAN_BS1;          /*!< Specifies the number of time quanta in Bit Segment 1.

-                                 This parameter can be a value of @ref CAN_time_quantum_in_bit_segment_1 */

-

-  uint8_t CAN_BS2;          /*!< Specifies the number of time quanta in Bit Segment 2.

-                                 This parameter can be a value of @ref CAN_time_quantum_in_bit_segment_2 */

+                                 This parameter can be a value of 

+                                @ref CAN_operating_mode */

+

+  uint8_t CAN_SJW;          /*!< Specifies the maximum number of time quanta 

+                                 the CAN hardware is allowed to lengthen or 

+                                 shorten a bit to perform resynchronization.

+                                 This parameter can be a value of 

+                                 @ref CAN_synchronisation_jump_width */

+

+  uint8_t CAN_BS1;          /*!< Specifies the number of time quanta in Bit 

+                                 Segment 1. This parameter can be a value of 

+                                 @ref CAN_time_quantum_in_bit_segment_1 */

+

+  uint8_t CAN_BS2;          /*!< Specifies the number of time quanta in Bit 

+                                 Segment 2.

+                                 This parameter can be a value of 

+                                 @ref CAN_time_quantum_in_bit_segment_2 */

   

   

-  FunctionalState CAN_TTCM; /*!< Enable or disable the time triggered communication mode.

-                                 This parameter can be set either to ENABLE or DISABLE. */

+  FunctionalState CAN_TTCM; /*!< Enable or disable the time triggered 

+                                 communication mode. This parameter can be set 

+                                 either to ENABLE or DISABLE. */

   

   

-  FunctionalState CAN_ABOM;  /*!< Enable or disable the automatic bus-off management.

-                                 This parameter can be set either to ENABLE or DISABLE. */

+  FunctionalState CAN_ABOM;  /*!< Enable or disable the automatic bus-off 

+                                  management. This parameter can be set either 

+                                  to ENABLE or DISABLE. */

 

 

   FunctionalState CAN_AWUM;  /*!< Enable or disable the automatic wake-up mode. 

   FunctionalState CAN_AWUM;  /*!< Enable or disable the automatic wake-up mode. 

-                                 This parameter can be set either to ENABLE or DISABLE. */

+                                  This parameter can be set either to ENABLE or 

+                                  DISABLE. */

 

 

-  FunctionalState CAN_NART;  /*!< Enable or disable the no-automatic retransmission mode.

-                                 This parameter can be set either to ENABLE or DISABLE. */

+  FunctionalState CAN_NART;  /*!< Enable or disable the no-automatic 

+                                  retransmission mode. This parameter can be 

+                                  set either to ENABLE or DISABLE. */

 

 

   FunctionalState CAN_RFLM;  /*!< Enable or disable the Receive FIFO Locked mode.

   FunctionalState CAN_RFLM;  /*!< Enable or disable the Receive FIFO Locked mode.

-                                 This parameter can be set either to ENABLE or DISABLE. */

+                                  This parameter can be set either to ENABLE 

+                                  or DISABLE. */

 

 

   FunctionalState CAN_TXFP;  /*!< Enable or disable the transmit FIFO priority.

   FunctionalState CAN_TXFP;  /*!< Enable or disable the transmit FIFO priority.

-                                 This parameter can be set either to ENABLE or DISABLE. */

+                                  This parameter can be set either to ENABLE 

+                                  or DISABLE. */

 } CAN_InitTypeDef;

 } CAN_InitTypeDef;

 

 

 /** 

 /** 

@@ -91,36 +105,36 @@ typedef struct
 
 

 

 typedef struct

 typedef struct

 {

 {

-  uint16_t CAN_FilterIdHigh;             /*!< Specifies the filter identification number (MSBs for a 32-bit

+  uint16_t CAN_FilterIdHigh;         /*!< Specifies the filter identification number (MSBs for a 32-bit

                                               configuration, first one for a 16-bit configuration).

                                               configuration, first one for a 16-bit configuration).

                                               This parameter can be a value between 0x0000 and 0xFFFF */

                                               This parameter can be a value between 0x0000 and 0xFFFF */

 

 

-  uint16_t CAN_FilterIdLow;              /*!< Specifies the filter identification number (LSBs for a 32-bit

+  uint16_t CAN_FilterIdLow;          /*!< Specifies the filter identification number (LSBs for a 32-bit

                                               configuration, second one for a 16-bit configuration).

                                               configuration, second one for a 16-bit configuration).

                                               This parameter can be a value between 0x0000 and 0xFFFF */

                                               This parameter can be a value between 0x0000 and 0xFFFF */

 

 

-  uint16_t CAN_FilterMaskIdHigh;         /*!< Specifies the filter mask number or identification number,

+  uint16_t CAN_FilterMaskIdHigh;     /*!< Specifies the filter mask number or identification number,

                                               according to the mode (MSBs for a 32-bit configuration,

                                               according to the mode (MSBs for a 32-bit configuration,

                                               first one for a 16-bit configuration).

                                               first one for a 16-bit configuration).

                                               This parameter can be a value between 0x0000 and 0xFFFF */

                                               This parameter can be a value between 0x0000 and 0xFFFF */

 

 

-  uint16_t CAN_FilterMaskIdLow;          /*!< Specifies the filter mask number or identification number,

+  uint16_t CAN_FilterMaskIdLow;      /*!< Specifies the filter mask number or identification number,

                                               according to the mode (LSBs for a 32-bit configuration,

                                               according to the mode (LSBs for a 32-bit configuration,

                                               second one for a 16-bit configuration).

                                               second one for a 16-bit configuration).

                                               This parameter can be a value between 0x0000 and 0xFFFF */

                                               This parameter can be a value between 0x0000 and 0xFFFF */

 

 

-  uint16_t CAN_FilterFIFOAssignment;     /*!< Specifies the FIFO (0 or 1) which will be assigned to the filter.

+  uint16_t CAN_FilterFIFOAssignment; /*!< Specifies the FIFO (0 or 1) which will be assigned to the filter.

                                               This parameter can be a value of @ref CAN_filter_FIFO */

                                               This parameter can be a value of @ref CAN_filter_FIFO */

   

   

-  uint8_t CAN_FilterNumber;              /*!< Specifies the filter which will be initialized. It ranges from 0 to 13. */

+  uint8_t CAN_FilterNumber;          /*!< Specifies the filter which will be initialized. It ranges from 0 to 13. */

 

 

-  uint8_t CAN_FilterMode;                /*!< Specifies the filter mode to be initialized.

+  uint8_t CAN_FilterMode;            /*!< Specifies the filter mode to be initialized.

                                               This parameter can be a value of @ref CAN_filter_mode */

                                               This parameter can be a value of @ref CAN_filter_mode */

 

 

-  uint8_t CAN_FilterScale;               /*!< Specifies the filter scale.

+  uint8_t CAN_FilterScale;           /*!< Specifies the filter scale.

                                               This parameter can be a value of @ref CAN_filter_scale */

                                               This parameter can be a value of @ref CAN_filter_scale */

 

 

-  FunctionalState CAN_FilterActivation;  /*!< Enable or disable the filter.

+  FunctionalState CAN_FilterActivation; /*!< Enable or disable the filter.

                                               This parameter can be set either to ENABLE or DISABLE. */

                                               This parameter can be set either to ENABLE or DISABLE. */

 } CAN_FilterInitTypeDef;

 } CAN_FilterInitTypeDef;

 

 

@@ -136,16 +150,20 @@ typedef struct
 
   uint32_t ExtId;  /*!< Specifies the extended identifier.

   uint32_t ExtId;  /*!< Specifies the extended identifier.

                         This parameter can be a value between 0 to 0x1FFFFFFF. */

                         This parameter can be a value between 0 to 0x1FFFFFFF. */

 

 

-  uint8_t IDE;     /*!< Specifies the type of identifier for the message that will be transmitted.

-                        This parameter can be a value of @ref CAN_identifier_type */

+  uint8_t IDE;     /*!< Specifies the type of identifier for the message that 

+                        will be transmitted. This parameter can be a value 

+                        of @ref CAN_identifier_type */

 

 

-  uint8_t RTR;     /*!< Specifies the type of frame for the message that will be transmitted.

-                        This parameter can be a value of @ref CAN_remote_transmission_request */

+  uint8_t RTR;     /*!< Specifies the type of frame for the message that will 

+                        be transmitted. This parameter can be a value of 

+                        @ref CAN_remote_transmission_request */

 

 

-  uint8_t DLC;     /*!< Specifies the length of the frame that will be transmitted.

-                        This parameter can be a value between 0 to 8 */

+  uint8_t DLC;     /*!< Specifies the length of the frame that will be 

+                        transmitted. This parameter can be a value between 

+                        0 to 8 */

 

 

-  uint8_t Data[8]; /*!< Contains the data to be transmitted. It ranges from 0 to 0xFF. */

+  uint8_t Data[8]; /*!< Contains the data to be transmitted. It ranges from 0 

+                        to 0xFF. */

 } CanTxMsg;

 } CanTxMsg;

 

 

 /** 

 /** 

@@ -160,19 +178,23 @@ typedef struct
 
   uint32_t ExtId;  /*!< Specifies the extended identifier.

   uint32_t ExtId;  /*!< Specifies the extended identifier.

                         This parameter can be a value between 0 to 0x1FFFFFFF. */

                         This parameter can be a value between 0 to 0x1FFFFFFF. */

 

 

-  uint8_t IDE;     /*!< Specifies the type of identifier for the message that will be received.

-                        This parameter can be a value of @ref CAN_identifier_type */

+  uint8_t IDE;     /*!< Specifies the type of identifier for the message that 

+                        will be received. This parameter can be a value of 

+                        @ref CAN_identifier_type */

 

 

   uint8_t RTR;     /*!< Specifies the type of frame for the received message.

   uint8_t RTR;     /*!< Specifies the type of frame for the received message.

-                        This parameter can be a value of @ref CAN_remote_transmission_request */

+                        This parameter can be a value of 

+                        @ref CAN_remote_transmission_request */

 

 

   uint8_t DLC;     /*!< Specifies the length of the frame that will be received.

   uint8_t DLC;     /*!< Specifies the length of the frame that will be received.

                         This parameter can be a value between 0 to 8 */

                         This parameter can be a value between 0 to 8 */

 

 

-  uint8_t Data[8]; /*!< Contains the data to be received. It ranges from 0 to 0xFF. */

+  uint8_t Data[8]; /*!< Contains the data to be received. It ranges from 0 to 

+                        0xFF. */

 

 

-  uint8_t FMI;     /*!< Specifies the index of the filter the message stored in the mailbox passes through.

-                        This parameter can be a value between 0 to 0xFF */

+  uint8_t FMI;     /*!< Specifies the index of the filter the message stored in 

+                        the mailbox passes through. This parameter can be a 

+                        value between 0 to 0xFF */

 } CanRxMsg;

 } CanRxMsg;

 

 

 /**

 /**

@@ -187,14 +209,14 @@ typedef struct
 
   * @{

   * @{

   */

   */

 

 

-#define CANINITFAILED              ((uint8_t)0x00) /*!< CAN initialization failed */

-#define CANINITOK                  ((uint8_t)0x01) /*!< CAN initialization failed */

+#define CAN_InitStatus_Failed              ((uint8_t)0x00) /*!< CAN initialization failed */

+#define CAN_InitStatus_Success             ((uint8_t)0x01) /*!< CAN initialization OK */

 

 

 /**

 /**

   * @}

   * @}

   */

   */

 

 

-/** @defgroup CAN_operating_mode 

+/** @defgroup CAN_Mode 

   * @{

   * @{

   */

   */

 

 

@@ -203,8 +225,40 @@ typedef struct
 
 #define CAN_Mode_Silent             ((uint8_t)0x02)  /*!< silent mode */

 #define CAN_Mode_Silent             ((uint8_t)0x02)  /*!< silent mode */

 #define CAN_Mode_Silent_LoopBack    ((uint8_t)0x03)  /*!< loopback combined with silent mode */

 #define CAN_Mode_Silent_LoopBack    ((uint8_t)0x03)  /*!< loopback combined with silent mode */

 

 

-#define IS_CAN_MODE(MODE) (((MODE) == CAN_Mode_Normal) || ((MODE) == CAN_Mode_LoopBack)|| \

-                           ((MODE) == CAN_Mode_Silent) || ((MODE) == CAN_Mode_Silent_LoopBack))

+#define IS_CAN_MODE(MODE) (((MODE) == CAN_Mode_Normal) || \

+                           ((MODE) == CAN_Mode_LoopBack)|| \

+                           ((MODE) == CAN_Mode_Silent) || \

+                           ((MODE) == CAN_Mode_Silent_LoopBack))

+/**

+  * @}

+  */

+

+

+/**

+  * @defgroup CAN_Operating_Mode 

+  * @{

+  */  

+#define CAN_OperatingMode_Initialization  ((uint8_t)0x00) /*!< Initialization mode */

+#define CAN_OperatingMode_Normal          ((uint8_t)0x01) /*!< Normal mode */

+#define CAN_OperatingMode_Sleep           ((uint8_t)0x02) /*!< sleep mode */

+

+

+#define IS_CAN_OPERATING_MODE(MODE) (((MODE) == CAN_OperatingMode_Initialization) ||\

+                                    ((MODE) == CAN_OperatingMode_Normal)|| \

+																		((MODE) == CAN_OperatingMode_Sleep))

+/**

+  * @}

+  */

+  

+/**

+  * @defgroup CAN_Mode_Status

+  * @{

+  */  

+

+#define CAN_ModeStatus_Failed    ((uint8_t)0x00)                /*!< CAN entering the specific mode failed */

+#define CAN_ModeStatus_Success   ((uint8_t)!CAN_ModeStatus_Failed)   /*!< CAN entering the specific mode Succeed */

+

+

 /**

 /**

   * @}

   * @}

   */

   */

@@ -295,7 +349,7 @@ typedef struct
 
   * @{

   * @{

   */

   */

 

 

-#define CAN_FilterMode_IdMask       ((uint8_t)0x00)  /*!< id/mask mode */

+#define CAN_FilterMode_IdMask       ((uint8_t)0x00)  /*!< identifier/mask mode */

 #define CAN_FilterMode_IdList       ((uint8_t)0x01)  /*!< identifier list mode */

 #define CAN_FilterMode_IdList       ((uint8_t)0x01)  /*!< identifier list mode */

 

 

 #define IS_CAN_FILTER_MODE(MODE) (((MODE) == CAN_FilterMode_IdMask) || \

 #define IS_CAN_FILTER_MODE(MODE) (((MODE) == CAN_FilterMode_IdMask) || \

@@ -322,11 +376,10 @@ typedef struct
 
   * @{

   * @{

   */

   */

 

 

-#define CAN_FilterFIFO0             ((uint8_t)0x00)  /*!< Filter FIFO 0 assignment for filter x */

-#define CAN_FilterFIFO1             ((uint8_t)0x01)  /*!< Filter FIFO 1 assignment for filter x */

+#define CAN_Filter_FIFO0             ((uint8_t)0x00)  /*!< Filter FIFO 0 assignment for filter x */

+#define CAN_Filter_FIFO1             ((uint8_t)0x01)  /*!< Filter FIFO 1 assignment for filter x */

 #define IS_CAN_FILTER_FIFO(FIFO) (((FIFO) == CAN_FilterFIFO0) || \

 #define IS_CAN_FILTER_FIFO(FIFO) (((FIFO) == CAN_FilterFIFO0) || \

                                   ((FIFO) == CAN_FilterFIFO1))

                                   ((FIFO) == CAN_FilterFIFO1))

-

 /**

 /**

   * @}

   * @}

   */

   */

@@ -356,10 +409,10 @@ typedef struct
 
   * @{

   * @{

   */

   */

 

 

-#define CAN_ID_STD                 ((uint32_t)0x00000000)  /*!< Standard Id */

-#define CAN_ID_EXT                 ((uint32_t)0x00000004)  /*!< Extended Id */

-#define IS_CAN_IDTYPE(IDTYPE) (((IDTYPE) == CAN_ID_STD) || ((IDTYPE) == CAN_ID_EXT))

-

+#define CAN_Id_Standard             ((uint32_t)0x00000000)  /*!< Standard Id */

+#define CAN_Id_Extended             ((uint32_t)0x00000004)  /*!< Extended Id */

+#define IS_CAN_IDTYPE(IDTYPE) (((IDTYPE) == CAN_Id_Standard) || \

+                               ((IDTYPE) == CAN_Id_Extended))

 /**

 /**

   * @}

   * @}

   */

   */

@@ -368,9 +421,9 @@ typedef struct
 
   * @{

   * @{

   */

   */

 

 

-#define CAN_RTR_DATA                ((uint32_t)0x00000000)  /*!< Data frame */

-#define CAN_RTR_REMOTE              ((uint32_t)0x00000002)  /*!< Remote frame */

-#define IS_CAN_RTR(RTR) (((RTR) == CAN_RTR_DATA) || ((RTR) == CAN_RTR_REMOTE))

+#define CAN_RTR_Data                ((uint32_t)0x00000000)  /*!< Data frame */

+#define CAN_RTR_Remote              ((uint32_t)0x00000002)  /*!< Remote frame */

+#define IS_CAN_RTR(RTR) (((RTR) == CAN_RTR_Data) || ((RTR) == CAN_RTR_Remote))

 

 

 /**

 /**

   * @}

   * @}

@@ -380,10 +433,10 @@ typedef struct
 
   * @{

   * @{

   */

   */

 

 

-#define CANTXFAILED                 ((uint8_t)0x00) /*!< CAN transmission failed */

-#define CANTXOK                     ((uint8_t)0x01) /*!< CAN transmission succeeded */

-#define CANTXPENDING                ((uint8_t)0x02) /*!< CAN transmission pending */

-#define CAN_NO_MB                   ((uint8_t)0x04) /*!< CAN cell did not provide an empty mailbox */

+#define CAN_TxStatus_Failed         ((uint8_t)0x00)/*!< CAN transmission failed */

+#define CAN_TxStatus_Ok             ((uint8_t)0x01) /*!< CAN transmission succeeded */

+#define CAN_TxStatus_Pending        ((uint8_t)0x02) /*!< CAN transmission pending */

+#define CAN_TxStatus_NoMailBox      ((uint8_t)0x04) /*!< CAN cell did not provide an empty mailbox */

 

 

 /**

 /**

   * @}

   * @}

@@ -393,8 +446,8 @@ typedef struct
 
   * @{

   * @{

   */

   */

 

 

-#define CAN_FIFO0                 ((uint8_t)0x00) /*!< CAN FIFO0 used to receive */

-#define CAN_FIFO1                 ((uint8_t)0x01) /*!< CAN FIFO1 used to receive */

+#define CAN_FIFO0                 ((uint8_t)0x00) /*!< CAN FIFO 0 used to receive */

+#define CAN_FIFO1                 ((uint8_t)0x01) /*!< CAN FIFO 1 used to receive */

 

 

 #define IS_CAN_FIFO(FIFO) (((FIFO) == CAN_FIFO0) || ((FIFO) == CAN_FIFO1))

 #define IS_CAN_FIFO(FIFO) (((FIFO) == CAN_FIFO0) || ((FIFO) == CAN_FIFO1))

 

 

@@ -406,8 +459,8 @@ typedef struct
 
   * @{

   * @{

   */

   */

 

 

-#define CANSLEEPFAILED              ((uint8_t)0x00) /*!< CAN did not enter the sleep mode */

-#define CANSLEEPOK                  ((uint8_t)0x01) /*!< CAN entered the sleep mode */

+#define CAN_Sleep_Failed     ((uint8_t)0x00) /*!< CAN did not enter the sleep mode */

+#define CAN_Sleep_Ok         ((uint8_t)0x01) /*!< CAN entered the sleep mode */

 

 

 /**

 /**

   * @}

   * @}

@@ -417,8 +470,27 @@ typedef struct
 
   * @{

   * @{

   */

   */

 

 

-#define CANWAKEUPFAILED             ((uint8_t)0x00) /*!< CAN did not leave the sleep mode */

-#define CANWAKEUPOK                 ((uint8_t)0x01) /*!< CAN leaved the sleep mode */

+#define CAN_WakeUp_Failed        ((uint8_t)0x00) /*!< CAN did not leave the sleep mode */

+#define CAN_WakeUp_Ok            ((uint8_t)0x01) /*!< CAN leaved the sleep mode */

+

+/**

+  * @}

+  */

+

+/**

+  * @defgroup   CAN_Error_Code_constants

+  * @{

+  */  

+                                                                

+#define CAN_ErrorCode_NoErr           ((uint8_t)0x00) /*!< No Error */ 

+#define	CAN_ErrorCode_StuffErr        ((uint8_t)0x10) /*!< Stuff Error */ 

+#define	CAN_ErrorCode_FormErr         ((uint8_t)0x20) /*!< Form Error */ 

+#define	CAN_ErrorCode_ACKErr          ((uint8_t)0x30) /*!< Acknowledgment Error */ 

+#define	CAN_ErrorCode_BitRecessiveErr ((uint8_t)0x40) /*!< Bit Recessive Error */ 

+#define	CAN_ErrorCode_BitDominantErr  ((uint8_t)0x50) /*!< Bit Dominant Error */ 

+#define	CAN_ErrorCode_CRCErr          ((uint8_t)0x60) /*!< CRC Error  */ 

+#define	CAN_ErrorCode_SoftwareSetErr  ((uint8_t)0x70) /*!< Software Set Error */ 

+

 

 

 /**

 /**

   * @}

   * @}

@@ -508,20 +580,44 @@ typedef struct
 
 #define CAN_IT_RQCP2   CAN_IT_TME

 #define CAN_IT_RQCP2   CAN_IT_TME

 

 

 

 

-#define IS_CAN_IT(IT)        (((IT) == CAN_IT_TME)   || ((IT) == CAN_IT_FMP0)  ||\

-                             ((IT) == CAN_IT_FF0)   || ((IT) == CAN_IT_FOV0)  ||\

-                             ((IT) == CAN_IT_FMP1)  || ((IT) == CAN_IT_FF1)   ||\

-                             ((IT) == CAN_IT_FOV1)  || ((IT) == CAN_IT_EWG)   ||\

-                             ((IT) == CAN_IT_EPV)   || ((IT) == CAN_IT_BOF)   ||\

-                             ((IT) == CAN_IT_LEC)   || ((IT) == CAN_IT_ERR)   ||\

-                             ((IT) == CAN_IT_WKU)   || ((IT) == CAN_IT_SLK))

+#define IS_CAN_IT(IT)        (((IT) == CAN_IT_TME) || ((IT) == CAN_IT_FMP0)  ||\

+                             ((IT) == CAN_IT_FF0)  || ((IT) == CAN_IT_FOV0)  ||\

+                             ((IT) == CAN_IT_FMP1) || ((IT) == CAN_IT_FF1)   ||\

+                             ((IT) == CAN_IT_FOV1) || ((IT) == CAN_IT_EWG)   ||\

+                             ((IT) == CAN_IT_EPV)  || ((IT) == CAN_IT_BOF)   ||\

+                             ((IT) == CAN_IT_LEC)  || ((IT) == CAN_IT_ERR)   ||\

+                             ((IT) == CAN_IT_WKU)  || ((IT) == CAN_IT_SLK))

+

+#define IS_CAN_CLEAR_IT(IT) (((IT) == CAN_IT_TME) || ((IT) == CAN_IT_FF0)    ||\

+                             ((IT) == CAN_IT_FOV0)|| ((IT) == CAN_IT_FF1)    ||\

+                             ((IT) == CAN_IT_FOV1)|| ((IT) == CAN_IT_EWG)    ||\

+                             ((IT) == CAN_IT_EPV) || ((IT) == CAN_IT_BOF)    ||\

+                             ((IT) == CAN_IT_LEC) || ((IT) == CAN_IT_ERR)    ||\

+                             ((IT) == CAN_IT_WKU) || ((IT) == CAN_IT_SLK))

 

 

-#define IS_CAN_CLEAR_IT(IT) (((IT) == CAN_IT_TME)    || ((IT) == CAN_IT_FF0)    ||\

-                             ((IT) == CAN_IT_FOV0)   || ((IT) == CAN_IT_FF1)    ||\

-                             ((IT) == CAN_IT_FOV1)   || ((IT) == CAN_IT_EWG)    ||\

-                             ((IT) == CAN_IT_EPV)    || ((IT) == CAN_IT_BOF)    ||\

-                             ((IT) == CAN_IT_LEC)    || ((IT) == CAN_IT_ERR)    ||\

-                             ((IT) == CAN_IT_WKU)    || ((IT) == CAN_IT_SLK))

+/**

+  * @}

+  */

+

+/** @defgroup CAN_Legacy 

+  * @{

+  */

+#define CANINITFAILED               CAN_InitStatus_Failed

+#define CANINITOK                   CAN_InitStatus_Success

+#define CAN_FilterFIFO0             CAN_Filter_FIFO0

+#define CAN_FilterFIFO1             CAN_Filter_FIFO1

+#define CAN_ID_STD                  CAN_Id_Standard           

+#define CAN_ID_EXT                  CAN_Id_Extended

+#define CAN_RTR_DATA                CAN_RTR_Data         

+#define CAN_RTR_REMOTE              CAN_RTR_Remote

+#define CANTXFAILE                  CAN_TxStatus_Failed

+#define CANTXOK                     CAN_TxStatus_Ok

+#define CANTXPENDING                CAN_TxStatus_Pending

+#define CAN_NO_MB                   CAN_TxStatus_NoMailBox

+#define CANSLEEPFAILED              CAN_Sleep_Failed

+#define CANSLEEPOK                  CAN_Sleep_Ok

+#define CANWAKEUPFAILED             CAN_WakeUp_Failed        

+#define CANWAKEUPOK                 CAN_WakeUp_Ok        

 

 

 /**

 /**

   * @}

   * @}

@@ -542,22 +638,40 @@ typedef struct
 
 /** @defgroup CAN_Exported_Functions

 /** @defgroup CAN_Exported_Functions

   * @{

   * @{

   */

   */

-

+/*  Function used to set the CAN configuration to the default reset state *****/ 

 void CAN_DeInit(CAN_TypeDef* CANx);

 void CAN_DeInit(CAN_TypeDef* CANx);

+

+/* Initialization and Configuration functions *********************************/ 

 uint8_t CAN_Init(CAN_TypeDef* CANx, CAN_InitTypeDef* CAN_InitStruct);

 uint8_t CAN_Init(CAN_TypeDef* CANx, CAN_InitTypeDef* CAN_InitStruct);

 void CAN_FilterInit(CAN_FilterInitTypeDef* CAN_FilterInitStruct);

 void CAN_FilterInit(CAN_FilterInitTypeDef* CAN_FilterInitStruct);

 void CAN_StructInit(CAN_InitTypeDef* CAN_InitStruct);

 void CAN_StructInit(CAN_InitTypeDef* CAN_InitStruct);

 void CAN_SlaveStartBank(uint8_t CAN_BankNumber); 

 void CAN_SlaveStartBank(uint8_t CAN_BankNumber); 

-void CAN_ITConfig(CAN_TypeDef* CANx, uint32_t CAN_IT, FunctionalState NewState);

+void CAN_DBGFreeze(CAN_TypeDef* CANx, FunctionalState NewState);

+void CAN_TTComModeCmd(CAN_TypeDef* CANx, FunctionalState NewState);

+

+/* Transmit functions *********************************************************/

 uint8_t CAN_Transmit(CAN_TypeDef* CANx, CanTxMsg* TxMessage);

 uint8_t CAN_Transmit(CAN_TypeDef* CANx, CanTxMsg* TxMessage);

 uint8_t CAN_TransmitStatus(CAN_TypeDef* CANx, uint8_t TransmitMailbox);

 uint8_t CAN_TransmitStatus(CAN_TypeDef* CANx, uint8_t TransmitMailbox);

 void CAN_CancelTransmit(CAN_TypeDef* CANx, uint8_t Mailbox);

 void CAN_CancelTransmit(CAN_TypeDef* CANx, uint8_t Mailbox);

+

+/* Receive functions **********************************************************/

+void CAN_Receive(CAN_TypeDef* CANx, uint8_t FIFONumber, CanRxMsg* RxMessage);

 void CAN_FIFORelease(CAN_TypeDef* CANx, uint8_t FIFONumber);

 void CAN_FIFORelease(CAN_TypeDef* CANx, uint8_t FIFONumber);

 uint8_t CAN_MessagePending(CAN_TypeDef* CANx, uint8_t FIFONumber);

 uint8_t CAN_MessagePending(CAN_TypeDef* CANx, uint8_t FIFONumber);

-void CAN_Receive(CAN_TypeDef* CANx, uint8_t FIFONumber, CanRxMsg* RxMessage);

-void CAN_DBGFreeze(CAN_TypeDef* CANx, FunctionalState NewState);

+

+

+/* Operation modes functions **************************************************/

+uint8_t CAN_OperatingModeRequest(CAN_TypeDef* CANx, uint8_t CAN_OperatingMode);

 uint8_t CAN_Sleep(CAN_TypeDef* CANx);

 uint8_t CAN_Sleep(CAN_TypeDef* CANx);

 uint8_t CAN_WakeUp(CAN_TypeDef* CANx);

 uint8_t CAN_WakeUp(CAN_TypeDef* CANx);

+

+/* Error management functions *************************************************/

+uint8_t CAN_GetLastErrorCode(CAN_TypeDef* CANx);

+uint8_t CAN_GetReceiveErrorCounter(CAN_TypeDef* CANx);

+uint8_t CAN_GetLSBTransmitErrorCounter(CAN_TypeDef* CANx);

+

+/* Interrupts and flags management functions **********************************/

+void CAN_ITConfig(CAN_TypeDef* CANx, uint32_t CAN_IT, FunctionalState NewState);

 FlagStatus CAN_GetFlagStatus(CAN_TypeDef* CANx, uint32_t CAN_FLAG);

 FlagStatus CAN_GetFlagStatus(CAN_TypeDef* CANx, uint32_t CAN_FLAG);

 void CAN_ClearFlag(CAN_TypeDef* CANx, uint32_t CAN_FLAG);

 void CAN_ClearFlag(CAN_TypeDef* CANx, uint32_t CAN_FLAG);

 ITStatus CAN_GetITStatus(CAN_TypeDef* CANx, uint32_t CAN_IT);

 ITStatus CAN_GetITStatus(CAN_TypeDef* CANx, uint32_t CAN_IT);

@@ -580,4 +694,4 @@ void CAN_ClearITPendingBit(CAN_TypeDef* CANx, uint32_t CAN_IT);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 8 - 7
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_cec.h

   * @file    stm32f10x_cec.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the CEC firmware 

   * @brief   This file contains all the functions prototypes for the CEC firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_CEC_H

 #ifndef __STM32F10x_CEC_H

@@ -101,7 +102,7 @@ typedef struct
 
   */ 

   */ 

 

 

 

 

-/** @defgroup CEC_Own_Addres 

+/** @defgroup CEC_Own_Address 

   * @{

   * @{

   */ 

   */ 

 #define IS_CEC_ADDRESS(ADDRESS) ((ADDRESS) < 0x10)

 #define IS_CEC_ADDRESS(ADDRESS) ((ADDRESS) < 0x10)

@@ -206,4 +207,4 @@ void CEC_ClearITPendingBit(uint16_t CEC_IT);
 
   * @}

   * @}

   */ 

   */ 

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_crc.h

   * @file    stm32f10x_crc.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the CRC firmware 

   * @brief   This file contains all the functions prototypes for the CRC firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_CRC_H

 #ifndef __STM32F10x_CRC_H

@@ -90,4 +91,4 @@ uint8_t CRC_GetIDRegister(void);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 8 - 7
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_dac.h

   * @file    stm32f10x_dac.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the DAC firmware 

   * @brief   This file contains all the functions prototypes for the DAC firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_DAC_H

 #ifndef __STM32F10x_DAC_H

@@ -200,7 +201,7 @@ typedef struct
 
   * @}

   * @}

   */

   */

 

 

-/** @defgroup DAC_data_alignement 

+/** @defgroup DAC_data_alignment 

   * @{

   * @{

   */

   */

 

 

@@ -313,4 +314,4 @@ void DAC_ClearITPendingBit(uint32_t DAC_Channel, uint32_t DAC_IT);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_dbgmcu.h

   * @file    stm32f10x_dbgmcu.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the DBGMCU 

   * @brief   This file contains all the functions prototypes for the DBGMCU 

   *          firmware library.

   *          firmware library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_DBGMCU_H

 #ifndef __STM32F10x_DBGMCU_H

@@ -115,4 +116,4 @@ void DBGMCU_Config(uint32_t DBGMCU_Periph, FunctionalState NewState);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 11 - 10
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_dma.h

   * @file    stm32f10x_dma.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the DMA firmware 

   * @brief   This file contains all the functions prototypes for the DMA firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_DMA_H

 #ifndef __STM32F10x_DMA_H

@@ -413,10 +414,10 @@ void DMA_Cmd(DMA_Channel_TypeDef* DMAy_Channelx, FunctionalState NewState);
 
 void DMA_ITConfig(DMA_Channel_TypeDef* DMAy_Channelx, uint32_t DMA_IT, FunctionalState NewState);

 void DMA_ITConfig(DMA_Channel_TypeDef* DMAy_Channelx, uint32_t DMA_IT, FunctionalState NewState);

 void DMA_SetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx, uint16_t DataNumber); 

 void DMA_SetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx, uint16_t DataNumber); 

 uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx);

 uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx);

-FlagStatus DMA_GetFlagStatus(uint32_t DMA_FLAG);

-void DMA_ClearFlag(uint32_t DMA_FLAG);

-ITStatus DMA_GetITStatus(uint32_t DMA_IT);

-void DMA_ClearITPendingBit(uint32_t DMA_IT);

+FlagStatus DMA_GetFlagStatus(uint32_t DMAy_FLAG);

+void DMA_ClearFlag(uint32_t DMAy_FLAG);

+ITStatus DMA_GetITStatus(uint32_t DMAy_IT);

+void DMA_ClearITPendingBit(uint32_t DMAy_IT);

 

 

 #ifdef __cplusplus

 #ifdef __cplusplus

 }

 }

@@ -435,4 +436,4 @@ void DMA_ClearITPendingBit(uint32_t DMA_IT);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_exti.h

   * @file    stm32f10x_exti.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the EXTI firmware

   * @brief   This file contains all the functions prototypes for the EXTI firmware

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_EXTI_H

 #ifndef __STM32F10x_EXTI_H

@@ -180,4 +181,4 @@ void EXTI_ClearITPendingBit(uint32_t EXTI_Line);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_flash.h

   * @file    stm32f10x_flash.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the FLASH 

   * @brief   This file contains all the functions prototypes for the FLASH 

   *          firmware library.

   *          firmware library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_FLASH_H

 #ifndef __STM32F10x_FLASH_H

@@ -422,4 +423,4 @@ FLASH_Status FLASH_BootConfig(uint16_t FLASH_BOOT);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 8 - 7
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_fsmc.h

   * @file    stm32f10x_fsmc.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the FSMC firmware 

   * @brief   This file contains all the functions prototypes for the FSMC firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_FSMC_H

 #ifndef __STM32F10x_FSMC_H

@@ -76,7 +77,7 @@ typedef struct
 
                                              to the memory before getting the first data.

                                              to the memory before getting the first data.

                                              The value of this parameter depends on the memory type as shown below:

                                              The value of this parameter depends on the memory type as shown below:

                                               - It must be set to 0 in case of a CRAM

                                               - It must be set to 0 in case of a CRAM

-                                              - It is don’t care in asynchronous NOR, SRAM or ROM accesses

+                                              - It is don't care in asynchronous NOR, SRAM or ROM accesses

                                               - It may assume a value between 0 and 0xF in NOR Flash memories

                                               - It may assume a value between 0 and 0xF in NOR Flash memories

                                                 with synchronous burst mode enable */

                                                 with synchronous burst mode enable */

 

 

@@ -729,4 +730,4 @@ void FSMC_ClearITPendingBit(uint32_t FSMC_Bank, uint32_t FSMC_IT);
 
   * @}

   * @}

   */ 

   */ 

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 8 - 7
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_gpio.h

   * @file    stm32f10x_gpio.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the GPIO 

   * @brief   This file contains all the functions prototypes for the GPIO 

   *          firmware library.

   *          firmware library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_GPIO_H

 #ifndef __STM32F10x_GPIO_H

@@ -195,7 +196,7 @@ typedef enum
 
 #define GPIO_Remap_SWJ_NoJTRST      ((uint32_t)0x00300100)  /*!< Full SWJ Enabled (JTAG-DP + SW-DP) but without JTRST */

 #define GPIO_Remap_SWJ_NoJTRST      ((uint32_t)0x00300100)  /*!< Full SWJ Enabled (JTAG-DP + SW-DP) but without JTRST */

 #define GPIO_Remap_SWJ_JTAGDisable  ((uint32_t)0x00300200)  /*!< JTAG-DP Disabled and SW-DP Enabled */

 #define GPIO_Remap_SWJ_JTAGDisable  ((uint32_t)0x00300200)  /*!< JTAG-DP Disabled and SW-DP Enabled */

 #define GPIO_Remap_SWJ_Disable      ((uint32_t)0x00300400)  /*!< Full SWJ Disabled (JTAG-DP + SW-DP) */

 #define GPIO_Remap_SWJ_Disable      ((uint32_t)0x00300400)  /*!< Full SWJ Disabled (JTAG-DP + SW-DP) */

-#define GPIO_Remap_SPI3             ((uint32_t)0x00201000)  /*!< SPI3/I2S3 Alternate Function mapping (only for Connectivity line devices) */

+#define GPIO_Remap_SPI3             ((uint32_t)0x00201100)  /*!< SPI3/I2S3 Alternate Function mapping (only for Connectivity line devices) */

 #define GPIO_Remap_TIM2ITR1_PTP_SOF ((uint32_t)0x00202000)  /*!< Ethernet PTP output or USB OTG SOF (Start of Frame) connected

 #define GPIO_Remap_TIM2ITR1_PTP_SOF ((uint32_t)0x00202000)  /*!< Ethernet PTP output or USB OTG SOF (Start of Frame) connected

                                                                  to TIM2 Internal Trigger 1 for calibration

                                                                  to TIM2 Internal Trigger 1 for calibration

                                                                  (only for Connectivity line devices) */

                                                                  (only for Connectivity line devices) */

@@ -381,4 +382,4 @@ void GPIO_ETH_MediaInterfaceConfig(uint32_t GPIO_ETH_MediaInterface);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 23 - 9
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_i2c.h

   * @file    stm32f10x_i2c.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the I2C firmware 

   * @brief   This file contains all the functions prototypes for the I2C firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_I2C_H

 #ifndef __STM32F10x_I2C_H

@@ -190,6 +191,18 @@ typedef struct
 
   * @}

   * @}

   */ 

   */ 

 

 

+/** @defgroup I2C_NCAK_position 

+  * @{

+  */

+

+#define I2C_NACKPosition_Next           ((uint16_t)0x0800)

+#define I2C_NACKPosition_Current        ((uint16_t)0xF7FF)

+#define IS_I2C_NACK_POSITION(POSITION)  (((POSITION) == I2C_NACKPosition_Next) || \

+                                         ((POSITION) == I2C_NACKPosition_Current))

+/**

+  * @}

+  */ 

+

 /** @defgroup I2C_interrupts_definition 

 /** @defgroup I2C_interrupts_definition 

   * @{

   * @{

   */

   */

@@ -433,7 +446,7 @@ typedef struct
 
   *      the end of the byte transmission. The two events I2C_EVENT_SLAVE_BYTE_TRANSMITTED and

   *      the end of the byte transmission. The two events I2C_EVENT_SLAVE_BYTE_TRANSMITTED and

   *      I2C_EVENT_SLAVE_BYTE_TRANSMITTING are similar. The second one can optionally be 

   *      I2C_EVENT_SLAVE_BYTE_TRANSMITTING are similar. The second one can optionally be 

   *      used when the user software doesn't guarantee the EV3 is managed before the

   *      used when the user software doesn't guarantee the EV3 is managed before the

-  *      current byte end of tranfer.

+  *      current byte end of transfer.

   *    - EV3_2: When the master sends a NACK in order to tell slave that data transmission 

   *    - EV3_2: When the master sends a NACK in order to tell slave that data transmission 

   *      shall end (before sending the STOP condition). In this case slave has to stop sending 

   *      shall end (before sending the STOP condition). In this case slave has to stop sending 

   *      data bytes and expect a Stop condition on the bus.

   *      data bytes and expect a Stop condition on the bus.

@@ -536,6 +549,7 @@ uint8_t I2C_ReceiveData(I2C_TypeDef* I2Cx);
 
 void I2C_Send7bitAddress(I2C_TypeDef* I2Cx, uint8_t Address, uint8_t I2C_Direction);

 void I2C_Send7bitAddress(I2C_TypeDef* I2Cx, uint8_t Address, uint8_t I2C_Direction);

 uint16_t I2C_ReadRegister(I2C_TypeDef* I2Cx, uint8_t I2C_Register);

 uint16_t I2C_ReadRegister(I2C_TypeDef* I2Cx, uint8_t I2C_Register);

 void I2C_SoftwareResetCmd(I2C_TypeDef* I2Cx, FunctionalState NewState);

 void I2C_SoftwareResetCmd(I2C_TypeDef* I2Cx, FunctionalState NewState);

+void I2C_NACKPositionConfig(I2C_TypeDef* I2Cx, uint16_t I2C_NACKPosition);

 void I2C_SMBusAlertConfig(I2C_TypeDef* I2Cx, uint16_t I2C_SMBusAlert);

 void I2C_SMBusAlertConfig(I2C_TypeDef* I2Cx, uint16_t I2C_SMBusAlert);

 void I2C_TransmitPEC(I2C_TypeDef* I2Cx, FunctionalState NewState);

 void I2C_TransmitPEC(I2C_TypeDef* I2Cx, FunctionalState NewState);

 void I2C_PECPositionConfig(I2C_TypeDef* I2Cx, uint16_t I2C_PECPosition);

 void I2C_PECPositionConfig(I2C_TypeDef* I2Cx, uint16_t I2C_PECPosition);

@@ -577,10 +591,10 @@ void I2C_FastModeDutyCycleConfig(I2C_TypeDef* I2Cx, uint16_t I2C_DutyCycle);
 
  *        @note 

  *        @note 

  *        For error management, it is advised to use the following functions:

  *        For error management, it is advised to use the following functions:

  *          - I2C_ITConfig() to configure and enable the error interrupts (I2C_IT_ERR).

  *          - I2C_ITConfig() to configure and enable the error interrupts (I2C_IT_ERR).

- *          - I2Cx_ER_IRQHandler() which is called when the error interurpt occurs.

+ *          - I2Cx_ER_IRQHandler() which is called when the error interrupt occurs.

  *            Where x is the peripheral instance (I2C1, I2C2 ...)

  *            Where x is the peripheral instance (I2C1, I2C2 ...)

  *          - I2C_GetFlagStatus() or I2C_GetITStatus() to be called into I2Cx_ER_IRQHandler()

  *          - I2C_GetFlagStatus() or I2C_GetITStatus() to be called into I2Cx_ER_IRQHandler()

- *            in order to determine which error occured.

+ *            in order to determine which error occurred.

  *          - I2C_ClearFlag() or I2C_ClearITPendingBit() and/or I2C_SoftwareResetCmd()

  *          - I2C_ClearFlag() or I2C_ClearITPendingBit() and/or I2C_SoftwareResetCmd()

  *            and/or I2C_GenerateStop() in order to clear the error flag and source,

  *            and/or I2C_GenerateStop() in order to clear the error flag and source,

  *            and return to correct communication status.

  *            and return to correct communication status.

@@ -667,4 +681,4 @@ void I2C_ClearITPendingBit(I2C_TypeDef* I2Cx, uint32_t I2C_IT);
 
   * @}

   * @}

   */ 

   */ 

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_iwdg.h

   * @file    stm32f10x_iwdg.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the IWDG 

   * @brief   This file contains all the functions prototypes for the IWDG 

   *          firmware library.

   *          firmware library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_IWDG_H

 #ifndef __STM32F10x_IWDG_H

@@ -136,4 +137,4 @@ FlagStatus IWDG_GetFlagStatus(uint16_t IWDG_FLAG);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_pwr.h

   * @file    stm32f10x_pwr.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the PWR firmware 

   * @brief   This file contains all the functions prototypes for the PWR firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_PWR_H

 #ifndef __STM32F10x_PWR_H

@@ -152,4 +153,4 @@ void PWR_ClearFlag(uint32_t PWR_FLAG);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_rcc.h

   * @file    stm32f10x_rcc.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the RCC firmware 

   * @brief   This file contains all the functions prototypes for the RCC firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_RCC_H

 #ifndef __STM32F10x_RCC_H

@@ -723,4 +724,4 @@ void RCC_ClearITPendingBit(uint8_t RCC_IT);
 
   * @}

   * @}

   */ 

   */ 

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_rtc.h

   * @file    stm32f10x_rtc.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the RTC firmware 

   * @brief   This file contains all the functions prototypes for the RTC firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_RTC_H

 #ifndef __STM32F10x_RTC_H

@@ -131,4 +132,4 @@ void RTC_ClearITPendingBit(uint16_t RTC_IT);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 8 - 7
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_sdio.h

   * @file    stm32f10x_sdio.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the SDIO firmware

   * @brief   This file contains all the functions prototypes for the SDIO firmware

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_SDIO_H

 #ifndef __STM32F10x_SDIO_H

@@ -189,7 +190,7 @@ typedef struct
 
   */ 

   */ 

 

 

 

 

-/** @defgroup SDIO_Interrupt_soucres 

+/** @defgroup SDIO_Interrupt_sources 

   * @{

   * @{

   */

   */

 

 

@@ -527,4 +528,4 @@ void SDIO_ClearITPendingBit(uint32_t SDIO_IT);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 8 - 7
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_spi.h

   * @file    stm32f10x_spi.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the SPI firmware 

   * @brief   This file contains all the functions prototypes for the SPI firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_SPI_H

 #ifndef __STM32F10x_SPI_H

@@ -339,7 +340,7 @@ typedef struct
 
   * @}

   * @}

   */

   */

 

 

-/** @defgroup SPI_NSS_internal_software_mangement 

+/** @defgroup SPI_NSS_internal_software_management 

   * @{

   * @{

   */

   */

 

 

@@ -483,4 +484,4 @@ void SPI_I2S_ClearITPendingBit(SPI_TypeDef* SPIx, uint8_t SPI_I2S_IT);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 74 - 47
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_tim.h

   * @file    stm32f10x_tim.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the TIM firmware 

   * @brief   This file contains all the functions prototypes for the TIM firmware 

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_TIM_H

 #ifndef __STM32F10x_TIM_H

@@ -44,7 +45,7 @@
 
 

 

 /** 

 /** 

   * @brief  TIM Time Base Init structure definition

   * @brief  TIM Time Base Init structure definition

-  * @note   This sturcture is used with all TIMx except for TIM6 and TIM7.    

+  * @note   This structure is used with all TIMx except for TIM6 and TIM7.    

   */

   */

 

 

 typedef struct

 typedef struct

@@ -132,7 +133,7 @@ typedef struct
 
 

 

 /** 

 /** 

   * @brief  BDTR structure definition 

   * @brief  BDTR structure definition 

-  * @note   This sturcture is used only with TIM1 and TIM8.    

+  * @note   This structure is used only with TIM1 and TIM8.    

   */

   */

 

 

 typedef struct

 typedef struct

@@ -669,42 +670,42 @@ typedef struct
 
   * @{

   * @{

   */

   */

 

 

-#define TIM_DMABurstLength_1Byte           ((uint16_t)0x0000)

-#define TIM_DMABurstLength_2Bytes          ((uint16_t)0x0100)

-#define TIM_DMABurstLength_3Bytes          ((uint16_t)0x0200)

-#define TIM_DMABurstLength_4Bytes          ((uint16_t)0x0300)

-#define TIM_DMABurstLength_5Bytes          ((uint16_t)0x0400)

-#define TIM_DMABurstLength_6Bytes          ((uint16_t)0x0500)

-#define TIM_DMABurstLength_7Bytes          ((uint16_t)0x0600)

-#define TIM_DMABurstLength_8Bytes          ((uint16_t)0x0700)

-#define TIM_DMABurstLength_9Bytes          ((uint16_t)0x0800)

-#define TIM_DMABurstLength_10Bytes         ((uint16_t)0x0900)

-#define TIM_DMABurstLength_11Bytes         ((uint16_t)0x0A00)

-#define TIM_DMABurstLength_12Bytes         ((uint16_t)0x0B00)

-#define TIM_DMABurstLength_13Bytes         ((uint16_t)0x0C00)

-#define TIM_DMABurstLength_14Bytes         ((uint16_t)0x0D00)

-#define TIM_DMABurstLength_15Bytes         ((uint16_t)0x0E00)

-#define TIM_DMABurstLength_16Bytes         ((uint16_t)0x0F00)

-#define TIM_DMABurstLength_17Bytes         ((uint16_t)0x1000)

-#define TIM_DMABurstLength_18Bytes         ((uint16_t)0x1100)

-#define IS_TIM_DMA_LENGTH(LENGTH) (((LENGTH) == TIM_DMABurstLength_1Byte) || \

-                                   ((LENGTH) == TIM_DMABurstLength_2Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_3Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_4Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_5Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_6Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_7Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_8Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_9Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_10Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_11Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_12Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_13Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_14Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_15Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_16Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_17Bytes) || \

-                                   ((LENGTH) == TIM_DMABurstLength_18Bytes))

+#define TIM_DMABurstLength_1Transfer           ((uint16_t)0x0000)

+#define TIM_DMABurstLength_2Transfers          ((uint16_t)0x0100)

+#define TIM_DMABurstLength_3Transfers          ((uint16_t)0x0200)

+#define TIM_DMABurstLength_4Transfers          ((uint16_t)0x0300)

+#define TIM_DMABurstLength_5Transfers          ((uint16_t)0x0400)

+#define TIM_DMABurstLength_6Transfers          ((uint16_t)0x0500)

+#define TIM_DMABurstLength_7Transfers          ((uint16_t)0x0600)

+#define TIM_DMABurstLength_8Transfers          ((uint16_t)0x0700)

+#define TIM_DMABurstLength_9Transfers          ((uint16_t)0x0800)

+#define TIM_DMABurstLength_10Transfers         ((uint16_t)0x0900)

+#define TIM_DMABurstLength_11Transfers         ((uint16_t)0x0A00)

+#define TIM_DMABurstLength_12Transfers         ((uint16_t)0x0B00)

+#define TIM_DMABurstLength_13Transfers         ((uint16_t)0x0C00)

+#define TIM_DMABurstLength_14Transfers         ((uint16_t)0x0D00)

+#define TIM_DMABurstLength_15Transfers         ((uint16_t)0x0E00)

+#define TIM_DMABurstLength_16Transfers         ((uint16_t)0x0F00)

+#define TIM_DMABurstLength_17Transfers         ((uint16_t)0x1000)

+#define TIM_DMABurstLength_18Transfers         ((uint16_t)0x1100)

+#define IS_TIM_DMA_LENGTH(LENGTH) (((LENGTH) == TIM_DMABurstLength_1Transfer) || \

+                                   ((LENGTH) == TIM_DMABurstLength_2Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_3Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_4Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_5Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_6Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_7Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_8Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_9Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_10Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_11Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_12Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_13Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_14Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_15Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_16Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_17Transfers) || \

+                                   ((LENGTH) == TIM_DMABurstLength_18Transfers))

 /**

 /**

   * @}

   * @}

   */ 

   */ 

@@ -866,7 +867,7 @@ typedef struct
 
   * @}

   * @}

   */ 

   */ 

 

 

-/** @defgroup TIM_Ouput_Compare_Preload_State 

+/** @defgroup TIM_Output_Compare_Preload_State 

   * @{

   * @{

   */

   */

 

 

@@ -878,7 +879,7 @@ typedef struct
 
   * @}

   * @}

   */ 

   */ 

 

 

-/** @defgroup TIM_Ouput_Compare_Fast_State 

+/** @defgroup TIM_Output_Compare_Fast_State 

   * @{

   * @{

   */

   */

 

 

@@ -891,7 +892,7 @@ typedef struct
 
   * @}

   * @}

   */ 

   */ 

 

 

-/** @defgroup TIM_Ouput_Compare_Clear_State 

+/** @defgroup TIM_Output_Compare_Clear_State 

   * @{

   * @{

   */

   */

 

 

@@ -1008,6 +1009,32 @@ typedef struct
 
   * @}

   * @}

   */ 

   */ 

 

 

+/** @defgroup TIM_Legacy 

+  * @{

+  */

+

+#define TIM_DMABurstLength_1Byte           TIM_DMABurstLength_1Transfer

+#define TIM_DMABurstLength_2Bytes          TIM_DMABurstLength_2Transfers

+#define TIM_DMABurstLength_3Bytes          TIM_DMABurstLength_3Transfers

+#define TIM_DMABurstLength_4Bytes          TIM_DMABurstLength_4Transfers

+#define TIM_DMABurstLength_5Bytes          TIM_DMABurstLength_5Transfers

+#define TIM_DMABurstLength_6Bytes          TIM_DMABurstLength_6Transfers

+#define TIM_DMABurstLength_7Bytes          TIM_DMABurstLength_7Transfers

+#define TIM_DMABurstLength_8Bytes          TIM_DMABurstLength_8Transfers

+#define TIM_DMABurstLength_9Bytes          TIM_DMABurstLength_9Transfers

+#define TIM_DMABurstLength_10Bytes         TIM_DMABurstLength_10Transfers

+#define TIM_DMABurstLength_11Bytes         TIM_DMABurstLength_11Transfers

+#define TIM_DMABurstLength_12Bytes         TIM_DMABurstLength_12Transfers

+#define TIM_DMABurstLength_13Bytes         TIM_DMABurstLength_13Transfers

+#define TIM_DMABurstLength_14Bytes         TIM_DMABurstLength_14Transfers

+#define TIM_DMABurstLength_15Bytes         TIM_DMABurstLength_15Transfers

+#define TIM_DMABurstLength_16Bytes         TIM_DMABurstLength_16Transfers

+#define TIM_DMABurstLength_17Bytes         TIM_DMABurstLength_17Transfers

+#define TIM_DMABurstLength_18Bytes         TIM_DMABurstLength_18Transfers

+/**

+  * @}

+  */

+

 /**

 /**

   * @}

   * @}

   */

   */

@@ -1134,4 +1161,4 @@ void TIM_ClearITPendingBit(TIM_TypeDef* TIMx, uint16_t TIM_IT);
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_usart.h

   * @file    stm32f10x_usart.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the USART 

   * @brief   This file contains all the functions prototypes for the USART 

   *          firmware library.

   *          firmware library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_USART_H

 #ifndef __STM32F10x_USART_H

@@ -408,4 +409,4 @@ void USART_ClearITPendingBit(USART_TypeDef* USARTx, uint16_t USART_IT);
 
   * @}

   * @}

   */ 

   */ 

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_wwdg.h

   * @file    stm32f10x_wwdg.h

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file contains all the functions prototypes for the WWDG firmware

   * @brief   This file contains all the functions prototypes for the WWDG firmware

   *          library.

   *          library.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Define to prevent recursive inclusion -------------------------------------*/

 /* Define to prevent recursive inclusion -------------------------------------*/

 #ifndef __STM32F10x_WWDG_H

 #ifndef __STM32F10x_WWDG_H

@@ -111,4 +112,4 @@ void WWDG_ClearFlag(void);
 
   * @}

   * @}

   */ 

   */ 

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 11 - 9
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c
查看文件 

@@ -2,12 +2,12 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    misc.c

   * @file    misc.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the miscellaneous firmware functions (add-on

   * @brief   This file provides all the miscellaneous firmware functions (add-on

   *          to CMSIS functions).

   *          to CMSIS functions).

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -16,8 +16,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "misc.h"

 #include "misc.h"

@@ -103,9 +104,9 @@ void NVIC_PriorityGroupConfig(uint32_t NVIC_PriorityGroup)
 
 

 

 /**

 /**

   * @brief  Initializes the NVIC peripheral according to the specified

   * @brief  Initializes the NVIC peripheral according to the specified

-  *   parameters in the NVIC_InitStruct.

+  *         parameters in the NVIC_InitStruct.

   * @param  NVIC_InitStruct: pointer to a NVIC_InitTypeDef structure that contains

   * @param  NVIC_InitStruct: pointer to a NVIC_InitTypeDef structure that contains

-  *   the configuration information for the specified NVIC peripheral.

+  *         the configuration information for the specified NVIC peripheral.

   * @retval None

   * @retval None

   */

   */

 void NVIC_Init(NVIC_InitTypeDef* NVIC_InitStruct)

 void NVIC_Init(NVIC_InitTypeDef* NVIC_InitStruct)

@@ -148,7 +149,8 @@ void NVIC_Init(NVIC_InitTypeDef* NVIC_InitStruct)
 
   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg NVIC_VectTab_RAM

   *     @arg NVIC_VectTab_RAM

   *     @arg NVIC_VectTab_FLASH

   *     @arg NVIC_VectTab_FLASH

-  * @param  Offset: Vector Table base offset field. This value must be a multiple of 0x100.

+  * @param  Offset: Vector Table base offset field. This value must be a multiple 

+  *         of 0x200.

   * @retval None

   * @retval None

   */

   */

 void NVIC_SetVectorTable(uint32_t NVIC_VectTab, uint32_t Offset)

 void NVIC_SetVectorTable(uint32_t NVIC_VectTab, uint32_t Offset)

@@ -220,4 +222,4 @@ void SysTick_CLKSourceConfig(uint32_t SysTick_CLKSource)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 25 - 24
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_adc.c

   * @file    stm32f10x_adc.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the ADC firmware functions.

   * @brief   This file provides all the ADC firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_adc.h"

 #include "stm32f10x_adc.h"

@@ -208,10 +209,10 @@ void ADC_DeInit(ADC_TypeDef* ADCx)
 
 

 

 /**

 /**

   * @brief  Initializes the ADCx peripheral according to the specified parameters

   * @brief  Initializes the ADCx peripheral according to the specified parameters

-  *   in the ADC_InitStruct.

+  *         in the ADC_InitStruct.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADC_InitStruct: pointer to an ADC_InitTypeDef structure that contains

   * @param  ADC_InitStruct: pointer to an ADC_InitTypeDef structure that contains

-  *   the configuration information for the specified ADC peripheral.

+  *         the configuration information for the specified ADC peripheral.

   * @retval None

   * @retval None

   */

   */

 void ADC_Init(ADC_TypeDef* ADCx, ADC_InitTypeDef* ADC_InitStruct)

 void ADC_Init(ADC_TypeDef* ADCx, ADC_InitTypeDef* ADC_InitStruct)

@@ -379,7 +380,7 @@ void ADC_ResetCalibration(ADC_TypeDef* ADCx)
 
 {

 {

   /* Check the parameters */

   /* Check the parameters */

   assert_param(IS_ADC_ALL_PERIPH(ADCx));

   assert_param(IS_ADC_ALL_PERIPH(ADCx));

-  /* Resets the selected ADC calibartion registers */  

+  /* Resets the selected ADC calibration registers */  

   ADCx->CR2 |= CR2_RSTCAL_Set;

   ADCx->CR2 |= CR2_RSTCAL_Set;

 }

 }

 

 

@@ -499,10 +500,10 @@ FlagStatus ADC_GetSoftwareStartConvStatus(ADC_TypeDef* ADCx)
 
 

 

 /**

 /**

   * @brief  Configures the discontinuous mode for the selected ADC regular

   * @brief  Configures the discontinuous mode for the selected ADC regular

-  *   group channel.

+  *         group channel.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  Number: specifies the discontinuous mode regular channel

   * @param  Number: specifies the discontinuous mode regular channel

-  *   count value. This number must be between 1 and 8.

+  *         count value. This number must be between 1 and 8.

   * @retval None

   * @retval None

   */

   */

 void ADC_DiscModeChannelCountConfig(ADC_TypeDef* ADCx, uint8_t Number)

 void ADC_DiscModeChannelCountConfig(ADC_TypeDef* ADCx, uint8_t Number)

@@ -525,11 +526,11 @@ void ADC_DiscModeChannelCountConfig(ADC_TypeDef* ADCx, uint8_t Number)
 
 

 

 /**

 /**

   * @brief  Enables or disables the discontinuous mode on regular group

   * @brief  Enables or disables the discontinuous mode on regular group

-  *   channel for the specified ADC

+  *         channel for the specified ADC

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  NewState: new state of the selected ADC discontinuous mode

   * @param  NewState: new state of the selected ADC discontinuous mode

-  *   on regular group channel.

-  *   This parameter can be: ENABLE or DISABLE.

+  *         on regular group channel.

+  *         This parameter can be: ENABLE or DISABLE.

   * @retval None

   * @retval None

   */

   */

 void ADC_DiscModeCmd(ADC_TypeDef* ADCx, FunctionalState NewState)

 void ADC_DiscModeCmd(ADC_TypeDef* ADCx, FunctionalState NewState)

@@ -551,7 +552,7 @@ void ADC_DiscModeCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
 
 

 

 /**

 /**

   * @brief  Configures for the selected ADC regular channel its corresponding

   * @brief  Configures for the selected ADC regular channel its corresponding

-  *   rank in the sequencer and its sample time.

+  *         rank in the sequencer and its sample time.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADC_Channel: the ADC channel to configure. 

   * @param  ADC_Channel: the ADC channel to configure. 

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

@@ -724,7 +725,7 @@ uint32_t ADC_GetDualModeConversionValue(void)
 
 

 

 /**

 /**

   * @brief  Enables or disables the selected ADC automatic injected group

   * @brief  Enables or disables the selected ADC automatic injected group

-  *   conversion after regular one.

+  *         conversion after regular one.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  NewState: new state of the selected ADC auto injected conversion

   * @param  NewState: new state of the selected ADC auto injected conversion

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

@@ -749,10 +750,10 @@ void ADC_AutoInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState)
 
 

 

 /**

 /**

   * @brief  Enables or disables the discontinuous mode for injected group

   * @brief  Enables or disables the discontinuous mode for injected group

-  *   channel for the specified ADC

+  *         channel for the specified ADC

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  NewState: new state of the selected ADC discontinuous mode

   * @param  NewState: new state of the selected ADC discontinuous mode

-  *   on injected group channel.

+  *         on injected group channel.

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

   * @retval None

   * @retval None

   */

   */

@@ -813,10 +814,10 @@ void ADC_ExternalTrigInjectedConvConfig(ADC_TypeDef* ADCx, uint32_t ADC_External
 
 

 

 /**

 /**

   * @brief  Enables or disables the ADCx injected channels conversion through

   * @brief  Enables or disables the ADCx injected channels conversion through

-  *   external trigger

+  *         external trigger

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  NewState: new state of the selected ADC external trigger start of

   * @param  NewState: new state of the selected ADC external trigger start of

-  *   injected conversion.

+  *         injected conversion.

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

   * @retval None

   * @retval None

   */

   */

@@ -839,7 +840,7 @@ void ADC_ExternalTrigInjectedConvCmd(ADC_TypeDef* ADCx, FunctionalState NewState
 
 

 

 /**

 /**

   * @brief  Enables or disables the selected ADC start of the injected 

   * @brief  Enables or disables the selected ADC start of the injected 

-  *   channels conversion.

+  *         channels conversion.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  NewState: new state of the selected ADC software start injected conversion.

   * @param  NewState: new state of the selected ADC software start injected conversion.

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

@@ -891,7 +892,7 @@ FlagStatus ADC_GetSoftwareStartInjectedConvCmdStatus(ADC_TypeDef* ADCx)
 
 

 

 /**

 /**

   * @brief  Configures for the selected ADC injected channel its corresponding

   * @brief  Configures for the selected ADC injected channel its corresponding

-  *   rank in the sequencer and its sample time.

+  *         rank in the sequencer and its sample time.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADC_Channel: the ADC channel to configure. 

   * @param  ADC_Channel: the ADC channel to configure. 

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

@@ -1065,7 +1066,7 @@ uint16_t ADC_GetInjectedConversionValue(ADC_TypeDef* ADCx, uint8_t ADC_InjectedC
 
 

 

 /**

 /**

   * @brief  Enables or disables the analog watchdog on single/all regular

   * @brief  Enables or disables the analog watchdog on single/all regular

-  *   or injected channels

+  *         or injected channels

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADC_AnalogWatchdog: the ADC analog watchdog configuration.

   * @param  ADC_AnalogWatchdog: the ADC analog watchdog configuration.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

@@ -1270,7 +1271,7 @@ ITStatus ADC_GetITStatus(ADC_TypeDef* ADCx, uint16_t ADC_IT)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the ADCx’s interrupt pending bits.

+  * @brief  Clears the ADCx's interrupt pending bits.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADCx: where x can be 1, 2 or 3 to select the ADC peripheral.

   * @param  ADC_IT: specifies the ADC interrupt pending bit to clear.

   * @param  ADC_IT: specifies the ADC interrupt pending bit to clear.

   *   This parameter can be any combination of the following values:

   *   This parameter can be any combination of the following values:

@@ -1303,4 +1304,4 @@ void ADC_ClearITPendingBit(ADC_TypeDef* ADCx, uint16_t ADC_IT)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_bkp.c

   * @file    stm32f10x_bkp.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the BKP firmware functions.

   * @brief   This file provides all the BKP firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_bkp.h"

 #include "stm32f10x_bkp.h"

@@ -304,4 +305,4 @@ void BKP_ClearITPendingBit(void)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

文件差異過大導致無法顯示
+ 461 - 217
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c


+ 8 - 7
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_cec.c

   * @file    stm32f10x_cec.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the CEC firmware functions.

   * @brief   This file provides all the CEC firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_cec.h"

 #include "stm32f10x_cec.h"

@@ -277,7 +278,7 @@ void CEC_EndOfMessageCmd(FunctionalState NewState)
 
   *     @arg CEC_FLAG_SBE: Start Bit Error

   *     @arg CEC_FLAG_SBE: Start Bit Error

   *     @arg CEC_FLAG_ACKE: Block Acknowledge Error

   *     @arg CEC_FLAG_ACKE: Block Acknowledge Error

   *     @arg CEC_FLAG_LINE: Line Error

   *     @arg CEC_FLAG_LINE: Line Error

-  *     @arg CEC_FLAG_TBTFE: Tx Block Transfer Finsihed Error

+  *     @arg CEC_FLAG_TBTFE: Tx Block Transfer Finished Error

   *     @arg CEC_FLAG_TEOM: Tx End Of Message 

   *     @arg CEC_FLAG_TEOM: Tx End Of Message 

   *     @arg CEC_FLAG_TERR: Tx Error

   *     @arg CEC_FLAG_TERR: Tx Error

   *     @arg CEC_FLAG_TBTRF: Tx Byte Transfer Request or Block Transfer Finished

   *     @arg CEC_FLAG_TBTRF: Tx Byte Transfer Request or Block Transfer Finished

@@ -429,4 +430,4 @@ void CEC_ClearITPendingBit(uint16_t CEC_IT)
 
   * @}

   * @}

   */ 

   */ 

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_crc.c

   * @file    stm32f10x_crc.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the CRC firmware functions.

   * @brief   This file provides all the CRC firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_crc.h"

 #include "stm32f10x_crc.h"

@@ -156,4 +157,4 @@ uint8_t CRC_GetIDRegister(void)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 26 - 25
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_dac.c

   * @file    stm32f10x_dac.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the DAC firmware functions.

   * @brief   This file provides all the DAC firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_dac.h"

 #include "stm32f10x_dac.h"

@@ -104,13 +105,13 @@ void DAC_DeInit(void)
 
 

 

 /**

 /**

   * @brief  Initializes the DAC peripheral according to the specified 

   * @brief  Initializes the DAC peripheral according to the specified 

-  *   parameters in the DAC_InitStruct.

+  *         parameters in the DAC_InitStruct.

   * @param  DAC_Channel: the selected DAC channel. 

   * @param  DAC_Channel: the selected DAC channel. 

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg DAC_Channel_1: DAC Channel1 selected

   *     @arg DAC_Channel_1: DAC Channel1 selected

   *     @arg DAC_Channel_2: DAC Channel2 selected

   *     @arg DAC_Channel_2: DAC Channel2 selected

   * @param  DAC_InitStruct: pointer to a DAC_InitTypeDef structure that

   * @param  DAC_InitStruct: pointer to a DAC_InitTypeDef structure that

-  *   contains the configuration information for the specified DAC channel.

+  *        contains the configuration information for the specified DAC channel.

   * @retval None

   * @retval None

   */

   */

 void DAC_Init(uint32_t DAC_Channel, DAC_InitTypeDef* DAC_InitStruct)

 void DAC_Init(uint32_t DAC_Channel, DAC_InitTypeDef* DAC_InitStruct)

@@ -126,8 +127,8 @@ void DAC_Init(uint32_t DAC_Channel, DAC_InitTypeDef* DAC_InitStruct)
 
   tmpreg1 = DAC->CR;

   tmpreg1 = DAC->CR;

   /* Clear BOFFx, TENx, TSELx, WAVEx and MAMPx bits */

   /* Clear BOFFx, TENx, TSELx, WAVEx and MAMPx bits */

   tmpreg1 &= ~(CR_CLEAR_MASK << DAC_Channel);

   tmpreg1 &= ~(CR_CLEAR_MASK << DAC_Channel);

-  /* Configure for the selected DAC channel: buffer output, trigger, wave genration,

-     mask/amplitude for wave genration */

+  /* Configure for the selected DAC channel: buffer output, trigger, wave generation,

+     mask/amplitude for wave generation */

   /* Set TSELx and TENx bits according to DAC_Trigger value */

   /* Set TSELx and TENx bits according to DAC_Trigger value */

   /* Set WAVEx bits according to DAC_WaveGeneration value */

   /* Set WAVEx bits according to DAC_WaveGeneration value */

   /* Set MAMPx bits according to DAC_LFSRUnmask_TriangleAmplitude value */ 

   /* Set MAMPx bits according to DAC_LFSRUnmask_TriangleAmplitude value */ 

@@ -143,7 +144,7 @@ void DAC_Init(uint32_t DAC_Channel, DAC_InitTypeDef* DAC_InitStruct)
 
 /**

 /**

   * @brief  Fills each DAC_InitStruct member with its default value.

   * @brief  Fills each DAC_InitStruct member with its default value.

   * @param  DAC_InitStruct : pointer to a DAC_InitTypeDef structure which will

   * @param  DAC_InitStruct : pointer to a DAC_InitTypeDef structure which will

-  *   be initialized.

+  *         be initialized.

   * @retval None

   * @retval None

   */

   */

 void DAC_StructInit(DAC_InitTypeDef* DAC_InitStruct)

 void DAC_StructInit(DAC_InitTypeDef* DAC_InitStruct)

@@ -330,11 +331,11 @@ void DAC_WaveGenerationCmd(uint32_t DAC_Channel, uint32_t DAC_Wave, FunctionalSt
 
 

 

 /**

 /**

   * @brief  Set the specified data holding register value for DAC channel1.

   * @brief  Set the specified data holding register value for DAC channel1.

-  * @param  DAC_Align: Specifies the data alignement for DAC channel1.

+  * @param  DAC_Align: Specifies the data alignment for DAC channel1.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

-  *     @arg DAC_Align_8b_R: 8bit right data alignement selected

-  *     @arg DAC_Align_12b_L: 12bit left data alignement selected

-  *     @arg DAC_Align_12b_R: 12bit right data alignement selected

+  *     @arg DAC_Align_8b_R: 8bit right data alignment selected

+  *     @arg DAC_Align_12b_L: 12bit left data alignment selected

+  *     @arg DAC_Align_12b_R: 12bit right data alignment selected

   * @param  Data : Data to be loaded in the selected data holding register.

   * @param  Data : Data to be loaded in the selected data holding register.

   * @retval None

   * @retval None

   */

   */

@@ -355,11 +356,11 @@ void DAC_SetChannel1Data(uint32_t DAC_Align, uint16_t Data)
 
 

 

 /**

 /**

   * @brief  Set the specified data holding register value for DAC channel2.

   * @brief  Set the specified data holding register value for DAC channel2.

-  * @param  DAC_Align: Specifies the data alignement for DAC channel2.

+  * @param  DAC_Align: Specifies the data alignment for DAC channel2.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

-  *     @arg DAC_Align_8b_R: 8bit right data alignement selected

-  *     @arg DAC_Align_12b_L: 12bit left data alignement selected

-  *     @arg DAC_Align_12b_R: 12bit right data alignement selected

+  *     @arg DAC_Align_8b_R: 8bit right data alignment selected

+  *     @arg DAC_Align_12b_L: 12bit left data alignment selected

+  *     @arg DAC_Align_12b_R: 12bit right data alignment selected

   * @param  Data : Data to be loaded in the selected data holding register.

   * @param  Data : Data to be loaded in the selected data holding register.

   * @retval None

   * @retval None

   */

   */

@@ -381,11 +382,11 @@ void DAC_SetChannel2Data(uint32_t DAC_Align, uint16_t Data)
 
 /**

 /**

   * @brief  Set the specified data holding register value for dual channel

   * @brief  Set the specified data holding register value for dual channel

   *   DAC.

   *   DAC.

-  * @param  DAC_Align: Specifies the data alignement for dual channel DAC.

+  * @param  DAC_Align: Specifies the data alignment for dual channel DAC.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

-  *     @arg DAC_Align_8b_R: 8bit right data alignement selected

-  *     @arg DAC_Align_12b_L: 12bit left data alignement selected

-  *     @arg DAC_Align_12b_R: 12bit right data alignement selected

+  *     @arg DAC_Align_8b_R: 8bit right data alignment selected

+  *     @arg DAC_Align_12b_L: 12bit left data alignment selected

+  *     @arg DAC_Align_12b_R: 12bit right data alignment selected

   * @param  Data2: Data for DAC Channel2 to be loaded in the selected data 

   * @param  Data2: Data for DAC Channel2 to be loaded in the selected data 

   *   holding register.

   *   holding register.

   * @param  Data1: Data for DAC Channel1 to be loaded in the selected data 

   * @param  Data1: Data for DAC Channel1 to be loaded in the selected data 

@@ -419,7 +420,7 @@ void DAC_SetDualChannelData(uint32_t DAC_Align, uint16_t Data2, uint16_t Data1)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Returns the last data output value of the selected DAC cahnnel.

+  * @brief  Returns the last data output value of the selected DAC channel.

   * @param  DAC_Channel: the selected DAC channel. 

   * @param  DAC_Channel: the selected DAC channel. 

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg DAC_Channel_1: DAC Channel1 selected

   *     @arg DAC_Channel_1: DAC Channel1 selected

@@ -534,7 +535,7 @@ ITStatus DAC_GetITStatus(uint32_t DAC_Channel, uint32_t DAC_IT)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the DAC channelx’s interrupt pending bits.

+  * @brief  Clears the DAC channelx's interrupt pending bits.

   * @param  DAC_Channel: the selected DAC channel. 

   * @param  DAC_Channel: the selected DAC channel. 

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg DAC_Channel_1: DAC Channel1 selected

   *     @arg DAC_Channel_1: DAC Channel1 selected

@@ -567,4 +568,4 @@ void DAC_ClearITPendingBit(uint32_t DAC_Channel, uint32_t DAC_IT)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_dbgmcu.c

   * @file    stm32f10x_dbgmcu.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the DBGMCU firmware functions.

   * @brief   This file provides all the DBGMCU firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_dbgmcu.h"

 #include "stm32f10x_dbgmcu.h"

@@ -158,4 +159,4 @@ void DBGMCU_Config(uint32_t DBGMCU_Periph, FunctionalState NewState)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 56 - 53
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_dma.c

   * @file    stm32f10x_dma.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the DMA firmware functions.

   * @brief   This file provides all the DMA firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_dma.h"

 #include "stm32f10x_dma.h"

@@ -99,7 +100,7 @@
 
 

 

 /**

 /**

   * @brief  Deinitializes the DMAy Channelx registers to their default reset

   * @brief  Deinitializes the DMAy Channelx registers to their default reset

-  *   values.

+  *         values.

   * @param  DMAy_Channelx: where y can be 1 or 2 to select the DMA and

   * @param  DMAy_Channelx: where y can be 1 or 2 to select the DMA and

   *   x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel.

   *   x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel.

   * @retval None

   * @retval None

@@ -191,11 +192,11 @@ void DMA_DeInit(DMA_Channel_TypeDef* DMAy_Channelx)
 
 

 

 /**

 /**

   * @brief  Initializes the DMAy Channelx according to the specified

   * @brief  Initializes the DMAy Channelx according to the specified

-  *   parameters in the DMA_InitStruct.

+  *         parameters in the DMA_InitStruct.

   * @param  DMAy_Channelx: where y can be 1 or 2 to select the DMA and 

   * @param  DMAy_Channelx: where y can be 1 or 2 to select the DMA and 

   *   x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel.

   *   x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel.

   * @param  DMA_InitStruct: pointer to a DMA_InitTypeDef structure that

   * @param  DMA_InitStruct: pointer to a DMA_InitTypeDef structure that

-  *   contains the configuration information for the specified DMA Channel.

+  *         contains the configuration information for the specified DMA Channel.

   * @retval None

   * @retval None

   */

   */

 void DMA_Init(DMA_Channel_TypeDef* DMAy_Channelx, DMA_InitTypeDef* DMA_InitStruct)

 void DMA_Init(DMA_Channel_TypeDef* DMAy_Channelx, DMA_InitTypeDef* DMA_InitStruct)

@@ -252,7 +253,7 @@ void DMA_Init(DMA_Channel_TypeDef* DMAy_Channelx, DMA_InitTypeDef* DMA_InitStruc
 
 /**

 /**

   * @brief  Fills each DMA_InitStruct member with its default value.

   * @brief  Fills each DMA_InitStruct member with its default value.

   * @param  DMA_InitStruct : pointer to a DMA_InitTypeDef structure which will

   * @param  DMA_InitStruct : pointer to a DMA_InitTypeDef structure which will

-  *   be initialized.

+  *         be initialized.

   * @retval None

   * @retval None

   */

   */

 void DMA_StructInit(DMA_InitTypeDef* DMA_InitStruct)

 void DMA_StructInit(DMA_InitTypeDef* DMA_InitStruct)

@@ -361,11 +362,11 @@ void DMA_SetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx, uint16_t DataNum
 
 

 

 /**

 /**

   * @brief  Returns the number of remaining data units in the current

   * @brief  Returns the number of remaining data units in the current

-  *   DMAy Channelx transfer.

+  *         DMAy Channelx transfer.

   * @param  DMAy_Channelx: where y can be 1 or 2 to select the DMA and 

   * @param  DMAy_Channelx: where y can be 1 or 2 to select the DMA and 

   *   x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel.

   *   x can be 1 to 7 for DMA1 and 1 to 5 for DMA2 to select the DMA Channel.

   * @retval The number of remaining data units in the current DMAy Channelx

   * @retval The number of remaining data units in the current DMAy Channelx

-  *   transfer.

+  *         transfer.

   */

   */

 uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx)

 uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx)

 {

 {

@@ -377,7 +378,7 @@ uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx)
 
 

 

 /**

 /**

   * @brief  Checks whether the specified DMAy Channelx flag is set or not.

   * @brief  Checks whether the specified DMAy Channelx flag is set or not.

-  * @param  DMA_FLAG: specifies the flag to check.

+  * @param  DMAy_FLAG: specifies the flag to check.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg DMA1_FLAG_GL1: DMA1 Channel1 global flag.

   *     @arg DMA1_FLAG_GL1: DMA1 Channel1 global flag.

   *     @arg DMA1_FLAG_TC1: DMA1 Channel1 transfer complete flag.

   *     @arg DMA1_FLAG_TC1: DMA1 Channel1 transfer complete flag.

@@ -427,17 +428,18 @@ uint16_t DMA_GetCurrDataCounter(DMA_Channel_TypeDef* DMAy_Channelx)
 
   *     @arg DMA2_FLAG_TC5: DMA2 Channel5 transfer complete flag.

   *     @arg DMA2_FLAG_TC5: DMA2 Channel5 transfer complete flag.

   *     @arg DMA2_FLAG_HT5: DMA2 Channel5 half transfer flag.

   *     @arg DMA2_FLAG_HT5: DMA2 Channel5 half transfer flag.

   *     @arg DMA2_FLAG_TE5: DMA2 Channel5 transfer error flag.

   *     @arg DMA2_FLAG_TE5: DMA2 Channel5 transfer error flag.

-  * @retval The new state of DMA_FLAG (SET or RESET).

+  * @retval The new state of DMAy_FLAG (SET or RESET).

   */

   */

-FlagStatus DMA_GetFlagStatus(uint32_t DMA_FLAG)

+FlagStatus DMA_GetFlagStatus(uint32_t DMAy_FLAG)

 {

 {

   FlagStatus bitstatus = RESET;

   FlagStatus bitstatus = RESET;

   uint32_t tmpreg = 0;

   uint32_t tmpreg = 0;

+  

   /* Check the parameters */

   /* Check the parameters */

-  assert_param(IS_DMA_GET_FLAG(DMA_FLAG));

+  assert_param(IS_DMA_GET_FLAG(DMAy_FLAG));

 

 

-  /* Calculate the used DMA */

-  if ((DMA_FLAG & FLAG_Mask) != (uint32_t)RESET)

+  /* Calculate the used DMAy */

+  if ((DMAy_FLAG & FLAG_Mask) != (uint32_t)RESET)

   {

   {

     /* Get DMA2 ISR register value */

     /* Get DMA2 ISR register value */

     tmpreg = DMA2->ISR ;

     tmpreg = DMA2->ISR ;

@@ -448,25 +450,25 @@ FlagStatus DMA_GetFlagStatus(uint32_t DMA_FLAG)
 
     tmpreg = DMA1->ISR ;

     tmpreg = DMA1->ISR ;

   }

   }

 

 

-  /* Check the status of the specified DMA flag */

-  if ((tmpreg & DMA_FLAG) != (uint32_t)RESET)

+  /* Check the status of the specified DMAy flag */

+  if ((tmpreg & DMAy_FLAG) != (uint32_t)RESET)

   {

   {

-    /* DMA_FLAG is set */

+    /* DMAy_FLAG is set */

     bitstatus = SET;

     bitstatus = SET;

   }

   }

   else

   else

   {

   {

-    /* DMA_FLAG is reset */

+    /* DMAy_FLAG is reset */

     bitstatus = RESET;

     bitstatus = RESET;

   }

   }

   

   

-  /* Return the DMA_FLAG status */

+  /* Return the DMAy_FLAG status */

   return  bitstatus;

   return  bitstatus;

 }

 }

 

 

 /**

 /**

   * @brief  Clears the DMAy Channelx's pending flags.

   * @brief  Clears the DMAy Channelx's pending flags.

-  * @param  DMA_FLAG: specifies the flag to clear.

+  * @param  DMAy_FLAG: specifies the flag to clear.

   *   This parameter can be any combination (for the same DMA) of the following values:

   *   This parameter can be any combination (for the same DMA) of the following values:

   *     @arg DMA1_FLAG_GL1: DMA1 Channel1 global flag.

   *     @arg DMA1_FLAG_GL1: DMA1 Channel1 global flag.

   *     @arg DMA1_FLAG_TC1: DMA1 Channel1 transfer complete flag.

   *     @arg DMA1_FLAG_TC1: DMA1 Channel1 transfer complete flag.

@@ -518,27 +520,27 @@ FlagStatus DMA_GetFlagStatus(uint32_t DMA_FLAG)
 
   *     @arg DMA2_FLAG_TE5: DMA2 Channel5 transfer error flag.

   *     @arg DMA2_FLAG_TE5: DMA2 Channel5 transfer error flag.

   * @retval None

   * @retval None

   */

   */

-void DMA_ClearFlag(uint32_t DMA_FLAG)

+void DMA_ClearFlag(uint32_t DMAy_FLAG)

 {

 {

   /* Check the parameters */

   /* Check the parameters */

-  assert_param(IS_DMA_CLEAR_FLAG(DMA_FLAG));

-  /* Calculate the used DMA */

+  assert_param(IS_DMA_CLEAR_FLAG(DMAy_FLAG));

 

 

-  if ((DMA_FLAG & FLAG_Mask) != (uint32_t)RESET)

+  /* Calculate the used DMAy */

+  if ((DMAy_FLAG & FLAG_Mask) != (uint32_t)RESET)

   {

   {

-    /* Clear the selected DMA flags */

-    DMA2->IFCR = DMA_FLAG;

+    /* Clear the selected DMAy flags */

+    DMA2->IFCR = DMAy_FLAG;

   }

   }

   else

   else

   {

   {

-    /* Clear the selected DMA flags */

-    DMA1->IFCR = DMA_FLAG;

+    /* Clear the selected DMAy flags */

+    DMA1->IFCR = DMAy_FLAG;

   }

   }

 }

 }

 

 

 /**

 /**

   * @brief  Checks whether the specified DMAy Channelx interrupt has occurred or not.

   * @brief  Checks whether the specified DMAy Channelx interrupt has occurred or not.

-  * @param  DMA_IT: specifies the DMA interrupt source to check. 

+  * @param  DMAy_IT: specifies the DMAy interrupt source to check. 

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg DMA1_IT_GL1: DMA1 Channel1 global interrupt.

   *     @arg DMA1_IT_GL1: DMA1 Channel1 global interrupt.

   *     @arg DMA1_IT_TC1: DMA1 Channel1 transfer complete interrupt.

   *     @arg DMA1_IT_TC1: DMA1 Channel1 transfer complete interrupt.

@@ -588,36 +590,37 @@ void DMA_ClearFlag(uint32_t DMA_FLAG)
 
   *     @arg DMA2_IT_TC5: DMA2 Channel5 transfer complete interrupt.

   *     @arg DMA2_IT_TC5: DMA2 Channel5 transfer complete interrupt.

   *     @arg DMA2_IT_HT5: DMA2 Channel5 half transfer interrupt.

   *     @arg DMA2_IT_HT5: DMA2 Channel5 half transfer interrupt.

   *     @arg DMA2_IT_TE5: DMA2 Channel5 transfer error interrupt.

   *     @arg DMA2_IT_TE5: DMA2 Channel5 transfer error interrupt.

-  * @retval The new state of DMA_IT (SET or RESET).

+  * @retval The new state of DMAy_IT (SET or RESET).

   */

   */

-ITStatus DMA_GetITStatus(uint32_t DMA_IT)

+ITStatus DMA_GetITStatus(uint32_t DMAy_IT)

 {

 {

   ITStatus bitstatus = RESET;

   ITStatus bitstatus = RESET;

   uint32_t tmpreg = 0;

   uint32_t tmpreg = 0;

+

   /* Check the parameters */

   /* Check the parameters */

-  assert_param(IS_DMA_GET_IT(DMA_IT));

+  assert_param(IS_DMA_GET_IT(DMAy_IT));

 

 

   /* Calculate the used DMA */

   /* Calculate the used DMA */

-  if ((DMA_IT & FLAG_Mask) != (uint32_t)RESET)

+  if ((DMAy_IT & FLAG_Mask) != (uint32_t)RESET)

   {

   {

     /* Get DMA2 ISR register value */

     /* Get DMA2 ISR register value */

-    tmpreg = DMA2->ISR ;

+    tmpreg = DMA2->ISR;

   }

   }

   else

   else

   {

   {

     /* Get DMA1 ISR register value */

     /* Get DMA1 ISR register value */

-    tmpreg = DMA1->ISR ;

+    tmpreg = DMA1->ISR;

   }

   }

 

 

-  /* Check the status of the specified DMA interrupt */

-  if ((tmpreg & DMA_IT) != (uint32_t)RESET)

+  /* Check the status of the specified DMAy interrupt */

+  if ((tmpreg & DMAy_IT) != (uint32_t)RESET)

   {

   {

-    /* DMA_IT is set */

+    /* DMAy_IT is set */

     bitstatus = SET;

     bitstatus = SET;

   }

   }

   else

   else

   {

   {

-    /* DMA_IT is reset */

+    /* DMAy_IT is reset */

     bitstatus = RESET;

     bitstatus = RESET;

   }

   }

   /* Return the DMA_IT status */

   /* Return the DMA_IT status */

@@ -625,8 +628,8 @@ ITStatus DMA_GetITStatus(uint32_t DMA_IT)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the DMAy Channelx’s interrupt pending bits.

-  * @param  DMA_IT: specifies the DMA interrupt pending bit to clear.

+  * @brief  Clears the DMAy Channelx's interrupt pending bits.

+  * @param  DMAy_IT: specifies the DMAy interrupt pending bit to clear.

   *   This parameter can be any combination (for the same DMA) of the following values:

   *   This parameter can be any combination (for the same DMA) of the following values:

   *     @arg DMA1_IT_GL1: DMA1 Channel1 global interrupt.

   *     @arg DMA1_IT_GL1: DMA1 Channel1 global interrupt.

   *     @arg DMA1_IT_TC1: DMA1 Channel1 transfer complete interrupt.

   *     @arg DMA1_IT_TC1: DMA1 Channel1 transfer complete interrupt.

@@ -678,21 +681,21 @@ ITStatus DMA_GetITStatus(uint32_t DMA_IT)
 
   *     @arg DMA2_IT_TE5: DMA2 Channel5 transfer error interrupt.

   *     @arg DMA2_IT_TE5: DMA2 Channel5 transfer error interrupt.

   * @retval None

   * @retval None

   */

   */

-void DMA_ClearITPendingBit(uint32_t DMA_IT)

+void DMA_ClearITPendingBit(uint32_t DMAy_IT)

 {

 {

   /* Check the parameters */

   /* Check the parameters */

-  assert_param(IS_DMA_CLEAR_IT(DMA_IT));

+  assert_param(IS_DMA_CLEAR_IT(DMAy_IT));

 

 

-  /* Calculate the used DMA */

-  if ((DMA_IT & FLAG_Mask) != (uint32_t)RESET)

+  /* Calculate the used DMAy */

+  if ((DMAy_IT & FLAG_Mask) != (uint32_t)RESET)

   {

   {

-    /* Clear the selected DMA interrupt pending bits */

-    DMA2->IFCR = DMA_IT;

+    /* Clear the selected DMAy interrupt pending bits */

+    DMA2->IFCR = DMAy_IT;

   }

   }

   else

   else

   {

   {

-    /* Clear the selected DMA interrupt pending bits */

-    DMA1->IFCR = DMA_IT;

+    /* Clear the selected DMAy interrupt pending bits */

+    DMA1->IFCR = DMAy_IT;

   }

   }

 }

 }

 

 

@@ -708,4 +711,4 @@ void DMA_ClearITPendingBit(uint32_t DMA_IT)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 12 - 11
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_exti.c

   * @file    stm32f10x_exti.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the EXTI firmware functions.

   * @brief   This file provides all the EXTI firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_exti.h"

 #include "stm32f10x_exti.h"

@@ -92,9 +93,9 @@ void EXTI_DeInit(void)
 
 

 

 /**

 /**

   * @brief  Initializes the EXTI peripheral according to the specified

   * @brief  Initializes the EXTI peripheral according to the specified

-  *   parameters in the EXTI_InitStruct.

+  *         parameters in the EXTI_InitStruct.

   * @param  EXTI_InitStruct: pointer to a EXTI_InitTypeDef structure

   * @param  EXTI_InitStruct: pointer to a EXTI_InitTypeDef structure

-  *   that contains the configuration information for the EXTI peripheral.

+  *         that contains the configuration information for the EXTI peripheral.

   * @retval None

   * @retval None

   */

   */

 void EXTI_Init(EXTI_InitTypeDef* EXTI_InitStruct)

 void EXTI_Init(EXTI_InitTypeDef* EXTI_InitStruct)

@@ -150,7 +151,7 @@ void EXTI_Init(EXTI_InitTypeDef* EXTI_InitStruct)
 
 /**

 /**

   * @brief  Fills each EXTI_InitStruct member with its reset value.

   * @brief  Fills each EXTI_InitStruct member with its reset value.

   * @param  EXTI_InitStruct: pointer to a EXTI_InitTypeDef structure which will

   * @param  EXTI_InitStruct: pointer to a EXTI_InitTypeDef structure which will

-  *   be initialized.

+  *         be initialized.

   * @retval None

   * @retval None

   */

   */

 void EXTI_StructInit(EXTI_InitTypeDef* EXTI_InitStruct)

 void EXTI_StructInit(EXTI_InitTypeDef* EXTI_InitStruct)

@@ -200,7 +201,7 @@ FlagStatus EXTI_GetFlagStatus(uint32_t EXTI_Line)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the EXTI’s line pending flags.

+  * @brief  Clears the EXTI's line pending flags.

   * @param  EXTI_Line: specifies the EXTI lines flags to clear.

   * @param  EXTI_Line: specifies the EXTI lines flags to clear.

   *   This parameter can be any combination of EXTI_Linex where x can be (0..19).

   *   This parameter can be any combination of EXTI_Linex where x can be (0..19).

   * @retval None

   * @retval None

@@ -240,7 +241,7 @@ ITStatus EXTI_GetITStatus(uint32_t EXTI_Line)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the EXTI’s line pending bits.

+  * @brief  Clears the EXTI's line pending bits.

   * @param  EXTI_Line: specifies the EXTI lines to clear.

   * @param  EXTI_Line: specifies the EXTI lines to clear.

   *   This parameter can be any combination of EXTI_Linex where x can be (0..19).

   *   This parameter can be any combination of EXTI_Linex where x can be (0..19).

   * @retval None

   * @retval None

@@ -265,4 +266,4 @@ void EXTI_ClearITPendingBit(uint32_t EXTI_Line)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 33 - 32
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_flash.c

   * @file    stm32f10x_flash.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the FLASH firmware functions.

   * @brief   This file provides all the FLASH firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_flash.h"

 #include "stm32f10x_flash.h"

@@ -413,7 +414,7 @@ void FLASH_LockBank2(void)
 
   * @note   This function can be used for all STM32F10x devices.

   * @note   This function can be used for all STM32F10x devices.

   * @param  Page_Address: The page address to be erased.

   * @param  Page_Address: The page address to be erased.

   * @retval FLASH Status: The returned value can be: FLASH_BUSY, FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_BUSY, FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_ErasePage(uint32_t Page_Address)

 FLASH_Status FLASH_ErasePage(uint32_t Page_Address)

 {

 {

@@ -486,7 +487,7 @@ FLASH_Status FLASH_ErasePage(uint32_t Page_Address)
 
   * @note   This function can be used for all STM32F10x devices.

   * @note   This function can be used for all STM32F10x devices.

   * @param  None

   * @param  None

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_EraseAllPages(void)

 FLASH_Status FLASH_EraseAllPages(void)

 {

 {

@@ -549,7 +550,7 @@ FLASH_Status FLASH_EraseAllPages(void)
 
   *           to FLASH_EraseAllPages function.

   *           to FLASH_EraseAllPages function.

   * @param  None

   * @param  None

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_EraseAllBank1Pages(void)

 FLASH_Status FLASH_EraseAllBank1Pages(void)

 {

 {

@@ -579,7 +580,7 @@ FLASH_Status FLASH_EraseAllBank1Pages(void)
 
   * @note   This function can be used only for STM32F10x_XL density devices.

   * @note   This function can be used only for STM32F10x_XL density devices.

   * @param  None

   * @param  None

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_EraseAllBank2Pages(void)

 FLASH_Status FLASH_EraseAllBank2Pages(void)

 {

 {

@@ -610,7 +611,7 @@ FLASH_Status FLASH_EraseAllBank2Pages(void)
 
   * @note   This function can be used for all STM32F10x devices.

   * @note   This function can be used for all STM32F10x devices.

   * @param  None

   * @param  None

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_EraseOptionBytes(void)

 FLASH_Status FLASH_EraseOptionBytes(void)

 {

 {

@@ -675,7 +676,7 @@ FLASH_Status FLASH_EraseOptionBytes(void)
 
   * @param  Address: specifies the address to be programmed.

   * @param  Address: specifies the address to be programmed.

   * @param  Data: specifies the data to be programmed.

   * @param  Data: specifies the data to be programmed.

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT. 

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT. 

   */

   */

 FLASH_Status FLASH_ProgramWord(uint32_t Address, uint32_t Data)

 FLASH_Status FLASH_ProgramWord(uint32_t Address, uint32_t Data)

 {

 {

@@ -852,7 +853,7 @@ FLASH_Status FLASH_ProgramWord(uint32_t Address, uint32_t Data)
 
   * @param  Address: specifies the address to be programmed.

   * @param  Address: specifies the address to be programmed.

   * @param  Data: specifies the data to be programmed.

   * @param  Data: specifies the data to be programmed.

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT. 

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT. 

   */

   */

 FLASH_Status FLASH_ProgramHalfWord(uint32_t Address, uint16_t Data)

 FLASH_Status FLASH_ProgramHalfWord(uint32_t Address, uint16_t Data)

 {

 {

@@ -923,7 +924,7 @@ FLASH_Status FLASH_ProgramHalfWord(uint32_t Address, uint16_t Data)
 
   *   This parameter can be 0x1FFFF804 or 0x1FFFF806. 

   *   This parameter can be 0x1FFFF804 or 0x1FFFF806. 

   * @param  Data: specifies the data to be programmed.

   * @param  Data: specifies the data to be programmed.

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT. 

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT. 

   */

   */

 FLASH_Status FLASH_ProgramOptionByteData(uint32_t Address, uint8_t Data)

 FLASH_Status FLASH_ProgramOptionByteData(uint32_t Address, uint8_t Data)

 {

 {

@@ -969,7 +970,7 @@ FLASH_Status FLASH_ProgramOptionByteData(uint32_t Address, uint8_t Data)
 
   *       FLASH_WRProt_Pages60to61 or FLASH_WRProt_Pages62to511

   *       FLASH_WRProt_Pages60to61 or FLASH_WRProt_Pages62to511

   *     @arg FLASH_WRProt_AllPages

   *     @arg FLASH_WRProt_AllPages

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_EnableWriteProtection(uint32_t FLASH_Pages)

 FLASH_Status FLASH_EnableWriteProtection(uint32_t FLASH_Pages)

 {

 {

@@ -1043,7 +1044,7 @@ FLASH_Status FLASH_EnableWriteProtection(uint32_t FLASH_Pages)
 
   * @param  Newstate: new state of the ReadOut Protection.

   * @param  Newstate: new state of the ReadOut Protection.

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_ReadOutProtection(FunctionalState NewState)

 FLASH_Status FLASH_ReadOutProtection(FunctionalState NewState)

 {

 {

@@ -1112,7 +1113,7 @@ FLASH_Status FLASH_ReadOutProtection(FunctionalState NewState)
 
   *     @arg OB_STDBY_NoRST: No reset generated when entering in STANDBY

   *     @arg OB_STDBY_NoRST: No reset generated when entering in STANDBY

   *     @arg OB_STDBY_RST: Reset generated when entering in STANDBY

   *     @arg OB_STDBY_RST: Reset generated when entering in STANDBY

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG, 

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG, 

-  * FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_UserOptionByteConfig(uint16_t OB_IWDG, uint16_t OB_STOP, uint16_t OB_STDBY)

 FLASH_Status FLASH_UserOptionByteConfig(uint16_t OB_IWDG, uint16_t OB_STOP, uint16_t OB_STDBY)

 {

 {

@@ -1166,7 +1167,7 @@ FLASH_Status FLASH_UserOptionByteConfig(uint16_t OB_IWDG, uint16_t OB_STOP, uint
 
   *        in the interrupt vector table).

   *        in the interrupt vector table).

   *        For more information, please refer to AN2606 from www.st.com.    

   *        For more information, please refer to AN2606 from www.st.com.    

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG, 

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG, 

-  * FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_BootConfig(uint16_t FLASH_BOOT)

 FLASH_Status FLASH_BootConfig(uint16_t FLASH_BOOT)

 { 

 { 

@@ -1210,7 +1211,7 @@ FLASH_Status FLASH_BootConfig(uint16_t FLASH_BOOT)
 
   * @note   This function can be used for all STM32F10x devices.

   * @note   This function can be used for all STM32F10x devices.

   * @param  None

   * @param  None

   * @retval The FLASH User Option Bytes values:IWDG_SW(Bit0), RST_STOP(Bit1)

   * @retval The FLASH User Option Bytes values:IWDG_SW(Bit0), RST_STOP(Bit1)

-  *   and RST_STDBY(Bit2).

+  *         and RST_STDBY(Bit2).

   */

   */

 uint32_t FLASH_GetUserOptionByte(void)

 uint32_t FLASH_GetUserOptionByte(void)

 {

 {

@@ -1226,7 +1227,7 @@ uint32_t FLASH_GetUserOptionByte(void)
 
   */

   */

 uint32_t FLASH_GetWriteProtectionOptionByte(void)

 uint32_t FLASH_GetWriteProtectionOptionByte(void)

 {

 {

-  /* Return the Falsh write protection Register value */

+  /* Return the Flash write protection Register value */

   return (uint32_t)(FLASH->WRPR);

   return (uint32_t)(FLASH->WRPR);

 }

 }

 

 

@@ -1428,7 +1429,7 @@ FlagStatus FLASH_GetFlagStatus(uint32_t FLASH_FLAG)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the FLASH’s pending flags.

+  * @brief  Clears the FLASH's pending flags.

   * @note   This function can be used for all STM32F10x devices.

   * @note   This function can be used for all STM32F10x devices.

   *         - For STM32F10X_XL devices, this function clears Bank1 or Bank2’s pending flags

   *         - For STM32F10X_XL devices, this function clears Bank1 or Bank2’s pending flags

   *         - For other devices, it clears Bank1’s pending flags.

   *         - For other devices, it clears Bank1’s pending flags.

@@ -1468,10 +1469,10 @@ void FLASH_ClearFlag(uint32_t FLASH_FLAG)
 
 /**

 /**

   * @brief  Returns the FLASH Status.

   * @brief  Returns the FLASH Status.

   * @note   This function can be used for all STM32F10x devices, it is equivalent

   * @note   This function can be used for all STM32F10x devices, it is equivalent

-  *    to FLASH_GetBank1Status function.

+  *         to FLASH_GetBank1Status function.

   * @param  None

   * @param  None

   * @retval FLASH Status: The returned value can be: FLASH_BUSY, FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_BUSY, FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP or FLASH_COMPLETE

+  *         FLASH_ERROR_WRP or FLASH_COMPLETE

   */

   */

 FLASH_Status FLASH_GetStatus(void)

 FLASH_Status FLASH_GetStatus(void)

 {

 {

@@ -1506,10 +1507,10 @@ FLASH_Status FLASH_GetStatus(void)
 
 /**

 /**

   * @brief  Returns the FLASH Bank1 Status.

   * @brief  Returns the FLASH Bank1 Status.

   * @note   This function can be used for all STM32F10x devices, it is equivalent

   * @note   This function can be used for all STM32F10x devices, it is equivalent

-  *   to FLASH_GetStatus function.

+  *         to FLASH_GetStatus function.

   * @param  None

   * @param  None

   * @retval FLASH Status: The returned value can be: FLASH_BUSY, FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_BUSY, FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP or FLASH_COMPLETE

+  *         FLASH_ERROR_WRP or FLASH_COMPLETE

   */

   */

 FLASH_Status FLASH_GetBank1Status(void)

 FLASH_Status FLASH_GetBank1Status(void)

 {

 {

@@ -1547,7 +1548,7 @@ FLASH_Status FLASH_GetBank1Status(void)
 
   * @note   This function can be used for STM32F10x_XL density devices.

   * @note   This function can be used for STM32F10x_XL density devices.

   * @param  None

   * @param  None

   * @retval FLASH Status: The returned value can be: FLASH_BUSY, FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_BUSY, FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP or FLASH_COMPLETE

+  *        FLASH_ERROR_WRP or FLASH_COMPLETE

   */

   */

 FLASH_Status FLASH_GetBank2Status(void)

 FLASH_Status FLASH_GetBank2Status(void)

 {

 {

@@ -1587,9 +1588,9 @@ FLASH_Status FLASH_GetBank2Status(void)
 
   *           to complete or a TIMEOUT to occur.

   *           to complete or a TIMEOUT to occur.

   *         - For all other devices it waits for a Flash operation to complete 

   *         - For all other devices it waits for a Flash operation to complete 

   *           or a TIMEOUT to occur.

   *           or a TIMEOUT to occur.

-  * @param  Timeout: FLASH progamming Timeout

+  * @param  Timeout: FLASH programming Timeout

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout)

 FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout)

 { 

 { 

@@ -1615,9 +1616,9 @@ FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout)
 
   * @brief  Waits for a Flash operation on Bank1 to complete or a TIMEOUT to occur.

   * @brief  Waits for a Flash operation on Bank1 to complete or a TIMEOUT to occur.

   * @note   This function can be used for all STM32F10x devices, 

   * @note   This function can be used for all STM32F10x devices, 

   *         it is equivalent to FLASH_WaitForLastOperation.

   *         it is equivalent to FLASH_WaitForLastOperation.

-  * @param  Timeout: FLASH progamming Timeout

+  * @param  Timeout: FLASH programming Timeout

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_WaitForLastBank1Operation(uint32_t Timeout)

 FLASH_Status FLASH_WaitForLastBank1Operation(uint32_t Timeout)

 { 

 { 

@@ -1643,9 +1644,9 @@ FLASH_Status FLASH_WaitForLastBank1Operation(uint32_t Timeout)
 
 /**

 /**

   * @brief  Waits for a Flash operation on Bank2 to complete or a TIMEOUT to occur.

   * @brief  Waits for a Flash operation on Bank2 to complete or a TIMEOUT to occur.

   * @note   This function can be used only for STM32F10x_XL density devices.

   * @note   This function can be used only for STM32F10x_XL density devices.

-  * @param  Timeout: FLASH progamming Timeout

+  * @param  Timeout: FLASH programming Timeout

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

   * @retval FLASH Status: The returned value can be: FLASH_ERROR_PG,

-  *   FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

+  *         FLASH_ERROR_WRP, FLASH_COMPLETE or FLASH_TIMEOUT.

   */

   */

 FLASH_Status FLASH_WaitForLastBank2Operation(uint32_t Timeout)

 FLASH_Status FLASH_WaitForLastBank2Operation(uint32_t Timeout)

 { 

 { 

@@ -1680,4 +1681,4 @@ FLASH_Status FLASH_WaitForLastBank2Operation(uint32_t Timeout)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 22 - 19
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_fsmc.c

   * @file    stm32f10x_fsmc.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the FSMC firmware functions.

   * @brief   This file provides all the FSMC firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_fsmc.h"

 #include "stm32f10x_fsmc.h"

@@ -89,7 +90,7 @@
 
 

 

 /**

 /**

   * @brief  Deinitializes the FSMC NOR/SRAM Banks registers to their default 

   * @brief  Deinitializes the FSMC NOR/SRAM Banks registers to their default 

-  *   reset values.

+  *         reset values.

   * @param  FSMC_Bank: specifies the FSMC Bank to be used

   * @param  FSMC_Bank: specifies the FSMC Bank to be used

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg FSMC_Bank1_NORSRAM1: FSMC Bank1 NOR/SRAM1  

   *     @arg FSMC_Bank1_NORSRAM1: FSMC Bank1 NOR/SRAM1  

@@ -166,10 +167,10 @@ void FSMC_PCCARDDeInit(void)
 
 

 

 /**

 /**

   * @brief  Initializes the FSMC NOR/SRAM Banks according to the specified

   * @brief  Initializes the FSMC NOR/SRAM Banks according to the specified

-  *   parameters in the FSMC_NORSRAMInitStruct.

+  *         parameters in the FSMC_NORSRAMInitStruct.

   * @param  FSMC_NORSRAMInitStruct : pointer to a FSMC_NORSRAMInitTypeDef

   * @param  FSMC_NORSRAMInitStruct : pointer to a FSMC_NORSRAMInitTypeDef

-  *   structure that contains the configuration information for 

-  *   the FSMC NOR/SRAM specified Banks.                       

+  *         structure that contains the configuration information for 

+  *        the FSMC NOR/SRAM specified Banks.                       

   * @retval None

   * @retval None

   */

   */

 void FSMC_NORSRAMInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)

 void FSMC_NORSRAMInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)

@@ -252,9 +253,10 @@ void FSMC_NORSRAMInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)
 
 

 

 /**

 /**

   * @brief  Initializes the FSMC NAND Banks according to the specified 

   * @brief  Initializes the FSMC NAND Banks according to the specified 

-  *   parameters in the FSMC_NANDInitStruct.

+  *         parameters in the FSMC_NANDInitStruct.

   * @param  FSMC_NANDInitStruct : pointer to a FSMC_NANDInitTypeDef 

   * @param  FSMC_NANDInitStruct : pointer to a FSMC_NANDInitTypeDef 

-  *   structure that contains the configuration information for the FSMC NAND specified Banks.                       

+  *         structure that contains the configuration information for the FSMC 

+  *         NAND specified Banks.                       

   * @retval None

   * @retval None

   */

   */

 void FSMC_NANDInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)

 void FSMC_NANDInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)

@@ -317,9 +319,10 @@ void FSMC_NANDInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)
 
 

 

 /**

 /**

   * @brief  Initializes the FSMC PCCARD Bank according to the specified 

   * @brief  Initializes the FSMC PCCARD Bank according to the specified 

-  *   parameters in the FSMC_PCCARDInitStruct.

+  *         parameters in the FSMC_PCCARDInitStruct.

   * @param  FSMC_PCCARDInitStruct : pointer to a FSMC_PCCARDInitTypeDef

   * @param  FSMC_PCCARDInitStruct : pointer to a FSMC_PCCARDInitTypeDef

-  *   structure that contains the configuration information for the FSMC PCCARD Bank.                       

+  *         structure that contains the configuration information for the FSMC 

+  *         PCCARD Bank.                       

   * @retval None

   * @retval None

   */

   */

 void FSMC_PCCARDInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct)

 void FSMC_PCCARDInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct)

@@ -371,7 +374,7 @@ void FSMC_PCCARDInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct)
 
 /**

 /**

   * @brief  Fills each FSMC_NORSRAMInitStruct member with its default value.

   * @brief  Fills each FSMC_NORSRAMInitStruct member with its default value.

   * @param  FSMC_NORSRAMInitStruct: pointer to a FSMC_NORSRAMInitTypeDef 

   * @param  FSMC_NORSRAMInitStruct: pointer to a FSMC_NORSRAMInitTypeDef 

-  *   structure which will be initialized.

+  *         structure which will be initialized.

   * @retval None

   * @retval None

   */

   */

 void FSMC_NORSRAMStructInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)

 void FSMC_NORSRAMStructInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)

@@ -409,7 +412,7 @@ void FSMC_NORSRAMStructInit(FSMC_NORSRAMInitTypeDef* FSMC_NORSRAMInitStruct)
 
 /**

 /**

   * @brief  Fills each FSMC_NANDInitStruct member with its default value.

   * @brief  Fills each FSMC_NANDInitStruct member with its default value.

   * @param  FSMC_NANDInitStruct: pointer to a FSMC_NANDInitTypeDef 

   * @param  FSMC_NANDInitStruct: pointer to a FSMC_NANDInitTypeDef 

-  *   structure which will be initialized.

+  *         structure which will be initialized.

   * @retval None

   * @retval None

   */

   */

 void FSMC_NANDStructInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)

 void FSMC_NANDStructInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)

@@ -435,7 +438,7 @@ void FSMC_NANDStructInit(FSMC_NANDInitTypeDef* FSMC_NANDInitStruct)
 
 /**

 /**

   * @brief  Fills each FSMC_PCCARDInitStruct member with its default value.

   * @brief  Fills each FSMC_PCCARDInitStruct member with its default value.

   * @param  FSMC_PCCARDInitStruct: pointer to a FSMC_PCCARDInitTypeDef 

   * @param  FSMC_PCCARDInitStruct: pointer to a FSMC_PCCARDInitTypeDef 

-  *   structure which will be initialized.

+  *         structure which will be initialized.

   * @retval None

   * @retval None

   */

   */

 void FSMC_PCCARDStructInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct)

 void FSMC_PCCARDStructInit(FSMC_PCCARDInitTypeDef* FSMC_PCCARDInitStruct)

@@ -728,7 +731,7 @@ FlagStatus FSMC_GetFlagStatus(uint32_t FSMC_Bank, uint32_t FSMC_FLAG)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the FSMC’s pending flags.

+  * @brief  Clears the FSMC's pending flags.

   * @param  FSMC_Bank: specifies the FSMC Bank to be used

   * @param  FSMC_Bank: specifies the FSMC Bank to be used

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg FSMC_Bank2_NAND: FSMC Bank2 NAND 

   *     @arg FSMC_Bank2_NAND: FSMC Bank2 NAND 

@@ -814,7 +817,7 @@ ITStatus FSMC_GetITStatus(uint32_t FSMC_Bank, uint32_t FSMC_IT)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the FSMC’s interrupt pending bits.

+  * @brief  Clears the FSMC's interrupt pending bits.

   * @param  FSMC_Bank: specifies the FSMC Bank to be used

   * @param  FSMC_Bank: specifies the FSMC Bank to be used

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg FSMC_Bank2_NAND: FSMC Bank2 NAND 

   *     @arg FSMC_Bank2_NAND: FSMC Bank2 NAND 

@@ -860,4 +863,4 @@ void FSMC_ClearITPendingBit(uint32_t FSMC_Bank, uint32_t FSMC_IT)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 12 - 9
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_gpio.c

   * @file    stm32f10x_gpio.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the GPIO firmware functions.

   * @brief   This file provides all the GPIO firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_gpio.h"

 #include "stm32f10x_gpio.h"

@@ -163,10 +164,10 @@ void GPIO_AFIODeInit(void)
 
 

 

 /**

 /**

   * @brief  Initializes the GPIOx peripheral according to the specified

   * @brief  Initializes the GPIOx peripheral according to the specified

-  *   parameters in the GPIO_InitStruct.

+  *         parameters in the GPIO_InitStruct.

   * @param  GPIOx: where x can be (A..G) to select the GPIO peripheral.

   * @param  GPIOx: where x can be (A..G) to select the GPIO peripheral.

   * @param  GPIO_InitStruct: pointer to a GPIO_InitTypeDef structure that

   * @param  GPIO_InitStruct: pointer to a GPIO_InitTypeDef structure that

-  *   contains the configuration information for the specified GPIO peripheral.

+  *         contains the configuration information for the specified GPIO peripheral.

   * @retval None

   * @retval None

   */

   */

 void GPIO_Init(GPIO_TypeDef* GPIOx, GPIO_InitTypeDef* GPIO_InitStruct)

 void GPIO_Init(GPIO_TypeDef* GPIOx, GPIO_InitTypeDef* GPIO_InitStruct)

@@ -259,7 +260,7 @@ void GPIO_Init(GPIO_TypeDef* GPIOx, GPIO_InitTypeDef* GPIO_InitStruct)
 
 /**

 /**

   * @brief  Fills each GPIO_InitStruct member with its default value.

   * @brief  Fills each GPIO_InitStruct member with its default value.

   * @param  GPIO_InitStruct : pointer to a GPIO_InitTypeDef structure which will

   * @param  GPIO_InitStruct : pointer to a GPIO_InitTypeDef structure which will

-  *   be initialized.

+  *         be initialized.

   * @retval None

   * @retval None

   */

   */

 void GPIO_StructInit(GPIO_InitTypeDef* GPIO_InitStruct)

 void GPIO_StructInit(GPIO_InitTypeDef* GPIO_InitStruct)

@@ -519,6 +520,8 @@ void GPIO_EventOutputCmd(FunctionalState NewState)
 
   *     @arg GPIO_Remap_SWJ_JTAGDisable  : JTAG-DP Disabled and SW-DP Enabled

   *     @arg GPIO_Remap_SWJ_JTAGDisable  : JTAG-DP Disabled and SW-DP Enabled

   *     @arg GPIO_Remap_SWJ_Disable      : Full SWJ Disabled (JTAG-DP + SW-DP)

   *     @arg GPIO_Remap_SWJ_Disable      : Full SWJ Disabled (JTAG-DP + SW-DP)

   *     @arg GPIO_Remap_SPI3             : SPI3/I2S3 Alternate Function mapping (only for Connectivity line devices)

   *     @arg GPIO_Remap_SPI3             : SPI3/I2S3 Alternate Function mapping (only for Connectivity line devices)

+  *                                        When the SPI3/I2S3 is remapped using this function, the SWJ is configured

+  *                                        to Full SWJ Enabled (JTAG-DP + SW-DP) but without JTRST.   

   *     @arg GPIO_Remap_TIM2ITR1_PTP_SOF : Ethernet PTP output or USB OTG SOF (Start of Frame) connected

   *     @arg GPIO_Remap_TIM2ITR1_PTP_SOF : Ethernet PTP output or USB OTG SOF (Start of Frame) connected

   *                                        to TIM2 Internal Trigger 1 for calibration (only for Connectivity line devices)

   *                                        to TIM2 Internal Trigger 1 for calibration (only for Connectivity line devices)

   *                                        If the GPIO_Remap_TIM2ITR1_PTP_SOF is enabled the TIM2 ITR1 is connected to 

   *                                        If the GPIO_Remap_TIM2ITR1_PTP_SOF is enabled the TIM2 ITR1 is connected to 

@@ -644,4 +647,4 @@ void GPIO_ETH_MediaInterfaceConfig(uint32_t GPIO_ETH_MediaInterface)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 62 - 16
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_i2c.c

   * @file    stm32f10x_i2c.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the I2C firmware functions.

   * @brief   This file provides all the I2C firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_i2c.h"

 #include "stm32f10x_i2c.h"

@@ -671,6 +672,46 @@ void I2C_SoftwareResetCmd(I2C_TypeDef* I2Cx, FunctionalState NewState)
 
   }

   }

 }

 }

 

 

+/**

+  * @brief  Selects the specified I2C NACK position in master receiver mode.

+  *         This function is useful in I2C Master Receiver mode when the number

+  *         of data to be received is equal to 2. In this case, this function 

+  *         should be called (with parameter I2C_NACKPosition_Next) before data 

+  *         reception starts,as described in the 2-byte reception procedure 

+  *         recommended in Reference Manual in Section: Master receiver.                

+  * @param  I2Cx: where x can be 1 or 2 to select the I2C peripheral.

+  * @param  I2C_NACKPosition: specifies the NACK position. 

+  *   This parameter can be one of the following values:

+  *     @arg I2C_NACKPosition_Next: indicates that the next byte will be the last

+  *          received byte.  

+  *     @arg I2C_NACKPosition_Current: indicates that current byte is the last 

+  *          received byte.

+  *            

+  * @note    This function configures the same bit (POS) as I2C_PECPositionConfig() 

+  *          but is intended to be used in I2C mode while I2C_PECPositionConfig() 

+  *          is intended to used in SMBUS mode. 

+  *            

+  * @retval None

+  */

+void I2C_NACKPositionConfig(I2C_TypeDef* I2Cx, uint16_t I2C_NACKPosition)

+{

+  /* Check the parameters */

+  assert_param(IS_I2C_ALL_PERIPH(I2Cx));

+  assert_param(IS_I2C_NACK_POSITION(I2C_NACKPosition));

+  

+  /* Check the input parameter */

+  if (I2C_NACKPosition == I2C_NACKPosition_Next)

+  {

+    /* Next byte in shift register is the last received byte */

+    I2Cx->CR1 |= I2C_NACKPosition_Next;

+  }

+  else

+  {

+    /* Current byte in shift register is the last received byte */

+    I2Cx->CR1 &= I2C_NACKPosition_Current;

+  }

+}

+

 /**

 /**

   * @brief  Drives the SMBusAlert pin high or low for the specified I2C.

   * @brief  Drives the SMBusAlert pin high or low for the specified I2C.

   * @param  I2Cx: where x can be 1 or 2 to select the I2C peripheral.

   * @param  I2Cx: where x can be 1 or 2 to select the I2C peripheral.

@@ -728,6 +769,11 @@ void I2C_TransmitPEC(I2C_TypeDef* I2Cx, FunctionalState NewState)
 
   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg I2C_PECPosition_Next: indicates that the next byte is PEC

   *     @arg I2C_PECPosition_Next: indicates that the next byte is PEC

   *     @arg I2C_PECPosition_Current: indicates that current byte is PEC

   *     @arg I2C_PECPosition_Current: indicates that current byte is PEC

+  *       

+  * @note    This function configures the same bit (POS) as I2C_NACKPositionConfig()

+  *          but is intended to be used in SMBUS mode while I2C_NACKPositionConfig() 

+  *          is intended to used in I2C mode.

+  *               

   * @retval None

   * @retval None

   */

   */

 void I2C_PECPositionConfig(I2C_TypeDef* I2Cx, uint16_t I2C_PECPosition)

 void I2C_PECPositionConfig(I2C_TypeDef* I2Cx, uint16_t I2C_PECPosition)

@@ -748,7 +794,7 @@ void I2C_PECPositionConfig(I2C_TypeDef* I2Cx, uint16_t I2C_PECPosition)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Enables or disables the PEC value calculation of the transfered bytes.

+  * @brief  Enables or disables the PEC value calculation of the transferred bytes.

   * @param  I2Cx: where x can be 1 or 2 to select the I2C peripheral.

   * @param  I2Cx: where x can be 1 or 2 to select the I2C peripheral.

   * @param  NewState: new state of the I2Cx PEC value calculation.

   * @param  NewState: new state of the I2Cx PEC value calculation.

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

@@ -878,7 +924,7 @@ void I2C_FastModeDutyCycleConfig(I2C_TypeDef* I2Cx, uint16_t I2C_DutyCycle)
 
  *    It returns SUCCESS if the current status includes the given flags 

  *    It returns SUCCESS if the current status includes the given flags 

  *    and returns ERROR if one or more flags are missing in the current status.

  *    and returns ERROR if one or more flags are missing in the current status.

  *    - When to use:

  *    - When to use:

- *      - This function is suitable for most applciations as well as for startup 

+ *      - This function is suitable for most applications as well as for startup 

  *      activity since the events are fully described in the product reference manual 

  *      activity since the events are fully described in the product reference manual 

  *      (RM0008).

  *      (RM0008).

  *      - It is also suitable for users who need to define their own events.

  *      - It is also suitable for users who need to define their own events.

@@ -892,7 +938,7 @@ void I2C_FastModeDutyCycleConfig(I2C_TypeDef* I2Cx, uint16_t I2C_DutyCycle)
 
  *        @note 

  *        @note 

  *        For error management, it is advised to use the following functions:

  *        For error management, it is advised to use the following functions:

  *          - I2C_ITConfig() to configure and enable the error interrupts (I2C_IT_ERR).

  *          - I2C_ITConfig() to configure and enable the error interrupts (I2C_IT_ERR).

- *          - I2Cx_ER_IRQHandler() which is called when the error interurpt occurs.

+ *          - I2Cx_ER_IRQHandler() which is called when the error interrupt occurs.

  *            Where x is the peripheral instance (I2C1, I2C2 ...)

  *            Where x is the peripheral instance (I2C1, I2C2 ...)

  *          - I2C_GetFlagStatus() or I2C_GetITStatus() to be called into I2Cx_ER_IRQHandler() 

  *          - I2C_GetFlagStatus() or I2C_GetITStatus() to be called into I2Cx_ER_IRQHandler() 

  *            in order to determine which error occured.

  *            in order to determine which error occured.

@@ -907,9 +953,9 @@ void I2C_FastModeDutyCycleConfig(I2C_TypeDef* I2Cx, uint16_t I2C_DutyCycle)
 
  *     by 16 bits and concatenated to Status Register 1).

  *     by 16 bits and concatenated to Status Register 1).

  *     - When to use:

  *     - When to use:

  *       - This function is suitable for the same applications above but it allows to

  *       - This function is suitable for the same applications above but it allows to

- *         overcome the mentionned limitation of I2C_GetFlagStatus() function.

+ *         overcome the mentioned limitation of I2C_GetFlagStatus() function.

  *         The returned value could be compared to events already defined in the 

  *         The returned value could be compared to events already defined in the 

- *         library (stm32f10x_i2c.h) or to custom values defiend by user.

+ *         library (stm32f10x_i2c.h) or to custom values defined by user.

  *       - This function is suitable when multiple flags are monitored at the same time.

  *       - This function is suitable when multiple flags are monitored at the same time.

  *       - At the opposite of I2C_CheckEvent() function, this function allows user to

  *       - At the opposite of I2C_CheckEvent() function, this function allows user to

  *         choose when an event is accepted (when all events flags are set and no 

  *         choose when an event is accepted (when all events flags are set and no 

@@ -977,7 +1023,7 @@ void I2C_FastModeDutyCycleConfig(I2C_TypeDef* I2Cx, uint16_t I2C_DutyCycle)
 
   * @note: For detailed description of Events, please refer to section 

   * @note: For detailed description of Events, please refer to section 

   *    I2C_Events in stm32f10x_i2c.h file.

   *    I2C_Events in stm32f10x_i2c.h file.

   *    

   *    

-  * @retval An ErrorStatus enumuration value:

+  * @retval An ErrorStatus enumeration value:

   * - SUCCESS: Last event is equal to the I2C_EVENT

   * - SUCCESS: Last event is equal to the I2C_EVENT

   * - ERROR: Last event is different from the I2C_EVENT

   * - ERROR: Last event is different from the I2C_EVENT

   */

   */

@@ -1079,8 +1125,8 @@ uint32_t I2C_GetLastEvent(I2C_TypeDef* I2Cx)
 
   *     @arg I2C_FLAG_STOPF: Stop detection flag (Slave mode)

   *     @arg I2C_FLAG_STOPF: Stop detection flag (Slave mode)

   *     @arg I2C_FLAG_ADD10: 10-bit header sent flag (Master mode)

   *     @arg I2C_FLAG_ADD10: 10-bit header sent flag (Master mode)

   *     @arg I2C_FLAG_BTF: Byte transfer finished flag

   *     @arg I2C_FLAG_BTF: Byte transfer finished flag

-  *     @arg I2C_FLAG_ADDR: Address sent flag (Master mode) “ADSL”

-  *   Address matched flag (Slave mode)”ENDAD”

+  *     @arg I2C_FLAG_ADDR: Address sent flag (Master mode) "ADSL"

+  *   Address matched flag (Slave mode)"ENDA"

   *     @arg I2C_FLAG_SB: Start bit flag (Master mode)

   *     @arg I2C_FLAG_SB: Start bit flag (Master mode)

   * @retval The new state of I2C_FLAG (SET or RESET).

   * @retval The new state of I2C_FLAG (SET or RESET).

   */

   */

@@ -1192,8 +1238,8 @@ void I2C_ClearFlag(I2C_TypeDef* I2Cx, uint32_t I2C_FLAG)
 
   *     @arg I2C_IT_STOPF: Stop detection flag (Slave mode)

   *     @arg I2C_IT_STOPF: Stop detection flag (Slave mode)

   *     @arg I2C_IT_ADD10: 10-bit header sent flag (Master mode)

   *     @arg I2C_IT_ADD10: 10-bit header sent flag (Master mode)

   *     @arg I2C_IT_BTF: Byte transfer finished flag

   *     @arg I2C_IT_BTF: Byte transfer finished flag

-  *     @arg I2C_IT_ADDR: Address sent flag (Master mode) “ADSL”

-  *                       Address matched flag (Slave mode)”ENDAD”

+  *     @arg I2C_IT_ADDR: Address sent flag (Master mode) "ADSL"

+  *                       Address matched flag (Slave mode)"ENDAD"

   *     @arg I2C_IT_SB: Start bit flag (Master mode)

   *     @arg I2C_IT_SB: Start bit flag (Master mode)

   * @retval The new state of I2C_IT (SET or RESET).

   * @retval The new state of I2C_IT (SET or RESET).

   */

   */

@@ -1282,4 +1328,4 @@ void I2C_ClearITPendingBit(I2C_TypeDef* I2Cx, uint32_t I2C_IT)
 
   * @}

   * @}

   */ 

   */ 

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_iwdg.c

   * @file    stm32f10x_iwdg.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the IWDG firmware functions.

   * @brief   This file provides all the IWDG firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_iwdg.h"

 #include "stm32f10x_iwdg.h"

@@ -186,4 +187,4 @@ FlagStatus IWDG_GetFlagStatus(uint16_t IWDG_FLAG)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_pwr.c

   * @file    stm32f10x_pwr.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the PWR firmware functions.

   * @brief   This file provides all the PWR firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_pwr.h"

 #include "stm32f10x_pwr.h"

@@ -303,4 +304,4 @@ void PWR_ClearFlag(uint32_t PWR_FLAG)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 9 - 8
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_rcc.c

   * @file    stm32f10x_rcc.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the RCC firmware functions.

   * @brief   This file provides all the RCC firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_rcc.h"

 #include "stm32f10x_rcc.h"

@@ -867,7 +868,7 @@ void RCC_LSICmd(FunctionalState NewState)
 
 

 

 /**

 /**

   * @brief  Configures the RTC clock (RTCCLK).

   * @brief  Configures the RTC clock (RTCCLK).

-  * @note   Once the RTC clock is selected it can’t be changed unless the Backup domain is reset.

+  * @note   Once the RTC clock is selected it can't be changed unless the Backup domain is reset.

   * @param  RCC_RTCCLKSource: specifies the RTC clock source.

   * @param  RCC_RTCCLKSource: specifies the RTC clock source.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg RCC_RTCCLKSource_LSE: LSE selected as RTC clock

   *     @arg RCC_RTCCLKSource_LSE: LSE selected as RTC clock

@@ -1419,7 +1420,7 @@ ITStatus RCC_GetITStatus(uint8_t RCC_IT)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the RCC’s interrupt pending bits.

+  * @brief  Clears the RCC's interrupt pending bits.

   * @param  RCC_IT: specifies the interrupt pending bit to clear.

   * @param  RCC_IT: specifies the interrupt pending bit to clear.

   *   

   *   

   *   For @b STM32_Connectivity_line_devices, this parameter can be any combination

   *   For @b STM32_Connectivity_line_devices, this parameter can be any combination

@@ -1466,4 +1467,4 @@ void RCC_ClearITPendingBit(uint8_t RCC_IT)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 12 - 11
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_rtc.c

   * @file    stm32f10x_rtc.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the RTC firmware functions.

   * @brief   This file provides all the RTC firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_rtc.h"

 #include "stm32f10x_rtc.h"

@@ -259,7 +260,7 @@ FlagStatus RTC_GetFlagStatus(uint16_t RTC_FLAG)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the RTC’s pending flags.

+  * @brief  Clears the RTC's pending flags.

   * @param  RTC_FLAG: specifies the flag to clear.

   * @param  RTC_FLAG: specifies the flag to clear.

   *   This parameter can be any combination of the following values:

   *   This parameter can be any combination of the following values:

   *     @arg RTC_FLAG_RSF: Registers Synchronized flag. This flag is cleared only after

   *     @arg RTC_FLAG_RSF: Registers Synchronized flag. This flag is cleared only after

@@ -274,12 +275,12 @@ void RTC_ClearFlag(uint16_t RTC_FLAG)
 
   /* Check the parameters */

   /* Check the parameters */

   assert_param(IS_RTC_CLEAR_FLAG(RTC_FLAG)); 

   assert_param(IS_RTC_CLEAR_FLAG(RTC_FLAG)); 

     

     

-  /* Clear the coressponding RTC flag */

+  /* Clear the corresponding RTC flag */

   RTC->CRL &= (uint16_t)~RTC_FLAG;

   RTC->CRL &= (uint16_t)~RTC_FLAG;

 }

 }

 

 

 /**

 /**

-  * @brief  Checks whether the specified RTC interrupt has occured or not.

+  * @brief  Checks whether the specified RTC interrupt has occurred or not.

   * @param  RTC_IT: specifies the RTC interrupts sources to check.

   * @param  RTC_IT: specifies the RTC interrupts sources to check.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg RTC_IT_OW: Overflow interrupt

   *     @arg RTC_IT_OW: Overflow interrupt

@@ -306,7 +307,7 @@ ITStatus RTC_GetITStatus(uint16_t RTC_IT)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the RTC’s interrupt pending bits.

+  * @brief  Clears the RTC's interrupt pending bits.

   * @param  RTC_IT: specifies the interrupt pending bit to clear.

   * @param  RTC_IT: specifies the interrupt pending bit to clear.

   *   This parameter can be any combination of the following values:

   *   This parameter can be any combination of the following values:

   *     @arg RTC_IT_OW: Overflow interrupt

   *     @arg RTC_IT_OW: Overflow interrupt

@@ -319,7 +320,7 @@ void RTC_ClearITPendingBit(uint16_t RTC_IT)
 
   /* Check the parameters */

   /* Check the parameters */

   assert_param(IS_RTC_IT(RTC_IT));  

   assert_param(IS_RTC_IT(RTC_IT));  

   

   

-  /* Clear the coressponding RTC pending bit */

+  /* Clear the corresponding RTC pending bit */

   RTC->CRL &= (uint16_t)~RTC_IT;

   RTC->CRL &= (uint16_t)~RTC_IT;

 }

 }

 

 

@@ -335,4 +336,4 @@ void RTC_ClearITPendingBit(uint16_t RTC_IT)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 15 - 14
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_sdio.c

   * @file    stm32f10x_sdio.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the SDIO firmware functions.

   * @brief   This file provides all the SDIO firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_sdio.h"

 #include "stm32f10x_sdio.h"

@@ -172,9 +173,9 @@ void SDIO_DeInit(void)
 
 

 

 /**

 /**

   * @brief  Initializes the SDIO peripheral according to the specified 

   * @brief  Initializes the SDIO peripheral according to the specified 

-  *   parameters in the SDIO_InitStruct.

+  *         parameters in the SDIO_InitStruct.

   * @param  SDIO_InitStruct : pointer to a SDIO_InitTypeDef structure 

   * @param  SDIO_InitStruct : pointer to a SDIO_InitTypeDef structure 

-  *   that contains the configuration information for the SDIO peripheral.

+  *         that contains the configuration information for the SDIO peripheral.

   * @retval None

   * @retval None

   */

   */

 void SDIO_Init(SDIO_InitTypeDef* SDIO_InitStruct)

 void SDIO_Init(SDIO_InitTypeDef* SDIO_InitStruct)

@@ -337,9 +338,9 @@ void SDIO_DMACmd(FunctionalState NewState)
 
 

 

 /**

 /**

   * @brief  Initializes the SDIO Command according to the specified 

   * @brief  Initializes the SDIO Command according to the specified 

-  *   parameters in the SDIO_CmdInitStruct and send the command.

+  *         parameters in the SDIO_CmdInitStruct and send the command.

   * @param  SDIO_CmdInitStruct : pointer to a SDIO_CmdInitTypeDef 

   * @param  SDIO_CmdInitStruct : pointer to a SDIO_CmdInitTypeDef 

-  *   structure that contains the configuration information for the SDIO command.

+  *         structure that contains the configuration information for the SDIO command.

   * @retval None

   * @retval None

   */

   */

 void SDIO_SendCommand(SDIO_CmdInitTypeDef *SDIO_CmdInitStruct)

 void SDIO_SendCommand(SDIO_CmdInitTypeDef *SDIO_CmdInitStruct)

@@ -375,7 +376,7 @@ void SDIO_SendCommand(SDIO_CmdInitTypeDef *SDIO_CmdInitStruct)
 
 /**

 /**

   * @brief  Fills each SDIO_CmdInitStruct member with its default value.

   * @brief  Fills each SDIO_CmdInitStruct member with its default value.

   * @param  SDIO_CmdInitStruct: pointer to an SDIO_CmdInitTypeDef 

   * @param  SDIO_CmdInitStruct: pointer to an SDIO_CmdInitTypeDef 

-  *   structure which will be initialized.

+  *         structure which will be initialized.

   * @retval None

   * @retval None

   */

   */

 void SDIO_CmdStructInit(SDIO_CmdInitTypeDef* SDIO_CmdInitStruct)

 void SDIO_CmdStructInit(SDIO_CmdInitTypeDef* SDIO_CmdInitStruct)

@@ -465,7 +466,7 @@ void SDIO_DataConfig(SDIO_DataInitTypeDef* SDIO_DataInitStruct)
 
 /**

 /**

   * @brief  Fills each SDIO_DataInitStruct member with its default value.

   * @brief  Fills each SDIO_DataInitStruct member with its default value.

   * @param  SDIO_DataInitStruct: pointer to an SDIO_DataInitTypeDef structure which

   * @param  SDIO_DataInitStruct: pointer to an SDIO_DataInitTypeDef structure which

-  *   will be initialized.

+  *         will be initialized.

   * @retval None

   * @retval None

   */

   */

 void SDIO_DataStructInit(SDIO_DataInitTypeDef* SDIO_DataInitStruct)

 void SDIO_DataStructInit(SDIO_DataInitTypeDef* SDIO_DataInitStruct)

@@ -550,7 +551,7 @@ void SDIO_StopSDIOReadWait(FunctionalState NewState)
 
 /**

 /**

   * @brief  Sets one of the two options of inserting read wait interval.

   * @brief  Sets one of the two options of inserting read wait interval.

   * @param  SDIO_ReadWaitMode: SD I/O Read Wait operation mode.

   * @param  SDIO_ReadWaitMode: SD I/O Read Wait operation mode.

-  *   This parametre can be:

+  *   This parameter can be:

   *     @arg SDIO_ReadWaitMode_CLK: Read Wait control by stopping SDIOCLK

   *     @arg SDIO_ReadWaitMode_CLK: Read Wait control by stopping SDIOCLK

   *     @arg SDIO_ReadWaitMode_DATA2: Read Wait control using SDIO_DATA2

   *     @arg SDIO_ReadWaitMode_DATA2: Read Wait control using SDIO_DATA2

   * @retval None

   * @retval None

@@ -757,7 +758,7 @@ ITStatus SDIO_GetITStatus(uint32_t SDIO_IT)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the SDIO’s interrupt pending bits.

+  * @brief  Clears the SDIO's interrupt pending bits.

   * @param  SDIO_IT: specifies the interrupt pending bit to clear. 

   * @param  SDIO_IT: specifies the interrupt pending bit to clear. 

   *   This parameter can be one or a combination of the following values:

   *   This parameter can be one or a combination of the following values:

   *     @arg SDIO_IT_CCRCFAIL: Command response received (CRC check failed) interrupt

   *     @arg SDIO_IT_CCRCFAIL: Command response received (CRC check failed) interrupt

@@ -795,4 +796,4 @@ void SDIO_ClearITPendingBit(uint32_t SDIO_IT)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 19 - 18
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_spi.c

   * @file    stm32f10x_spi.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the SPI firmware functions.

   * @brief   This file provides all the SPI firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_spi.h"

 #include "stm32f10x_spi.h"

@@ -111,7 +112,7 @@
 
 

 

 /**

 /**

   * @brief  Deinitializes the SPIx peripheral registers to their default

   * @brief  Deinitializes the SPIx peripheral registers to their default

-  *   reset values (Affects also the I2Ss).

+  *         reset values (Affects also the I2Ss).

   * @param  SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.

   * @param  SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.

   * @retval None

   * @retval None

   */

   */

@@ -148,10 +149,10 @@ void SPI_I2S_DeInit(SPI_TypeDef* SPIx)
 
 

 

 /**

 /**

   * @brief  Initializes the SPIx peripheral according to the specified 

   * @brief  Initializes the SPIx peripheral according to the specified 

-  *   parameters in the SPI_InitStruct.

+  *         parameters in the SPI_InitStruct.

   * @param  SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.

   * @param  SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.

   * @param  SPI_InitStruct: pointer to a SPI_InitTypeDef structure that

   * @param  SPI_InitStruct: pointer to a SPI_InitTypeDef structure that

-  *   contains the configuration information for the specified SPI peripheral.

+  *         contains the configuration information for the specified SPI peripheral.

   * @retval None

   * @retval None

   */

   */

 void SPI_Init(SPI_TypeDef* SPIx, SPI_InitTypeDef* SPI_InitStruct)

 void SPI_Init(SPI_TypeDef* SPIx, SPI_InitTypeDef* SPI_InitStruct)

@@ -202,12 +203,12 @@ void SPI_Init(SPI_TypeDef* SPIx, SPI_InitTypeDef* SPI_InitStruct)
 
 

 

 /**

 /**

   * @brief  Initializes the SPIx peripheral according to the specified 

   * @brief  Initializes the SPIx peripheral according to the specified 

-  *   parameters in the I2S_InitStruct.

+  *         parameters in the I2S_InitStruct.

   * @param  SPIx: where x can be  2 or 3 to select the SPI peripheral

   * @param  SPIx: where x can be  2 or 3 to select the SPI peripheral

-  *   (configured in I2S mode).

+  *         (configured in I2S mode).

   * @param  I2S_InitStruct: pointer to an I2S_InitTypeDef structure that

   * @param  I2S_InitStruct: pointer to an I2S_InitTypeDef structure that

-  *   contains the configuration information for the specified SPI peripheral

-  *   configured in I2S mode.

+  *         contains the configuration information for the specified SPI peripheral

+  *         configured in I2S mode.

   * @note

   * @note

   *  The function calculates the optimal prescaler needed to obtain the most 

   *  The function calculates the optimal prescaler needed to obtain the most 

   *  accurate audio frequency (depending on the I2S clock source, the PLL values 

   *  accurate audio frequency (depending on the I2S clock source, the PLL values 

@@ -283,7 +284,7 @@ void I2S_Init(SPI_TypeDef* SPIx, I2S_InitTypeDef* I2S_InitStruct)
 
       /* Get the value of the PLL3 multiplier */      

       /* Get the value of the PLL3 multiplier */      

       if((tmp > 5) && (tmp < 15))

       if((tmp > 5) && (tmp < 15))

       {

       {

-        /* Multplier is between 8 and 14 (value 15 is forbidden) */

+        /* Multiplier is between 8 and 14 (value 15 is forbidden) */

         tmp += 2;

         tmp += 2;

       }

       }

       else

       else

@@ -316,7 +317,7 @@ void I2S_Init(SPI_TypeDef* SPIx, I2S_InitTypeDef* I2S_InitStruct)
 
     sourceclock = RCC_Clocks.SYSCLK_Frequency;    

     sourceclock = RCC_Clocks.SYSCLK_Frequency;    

 #endif /* STM32F10X_CL */    

 #endif /* STM32F10X_CL */    

 

 

-    /* Compute the Real divider depending on the MCLK output state with a flaoting point */

+    /* Compute the Real divider depending on the MCLK output state with a floating point */

     if(I2S_InitStruct->I2S_MCLKOutput == I2S_MCLKOutput_Enable)

     if(I2S_InitStruct->I2S_MCLKOutput == I2S_MCLKOutput_Enable)

     {

     {

       /* MCLK output is enabled */

       /* MCLK output is enabled */

@@ -328,7 +329,7 @@ void I2S_Init(SPI_TypeDef* SPIx, I2S_InitTypeDef* I2S_InitStruct)
 
       tmp = (uint16_t)(((((sourceclock / (32 * packetlength)) *10 ) / I2S_InitStruct->I2S_AudioFreq)) + 5);

       tmp = (uint16_t)(((((sourceclock / (32 * packetlength)) *10 ) / I2S_InitStruct->I2S_AudioFreq)) + 5);

     }

     }

     

     

-    /* Remove the flaoting point */

+    /* Remove the floating point */

     tmp = tmp / 10;  

     tmp = tmp / 10;  

       

       

     /* Check the parity of the divider */

     /* Check the parity of the divider */

@@ -653,7 +654,7 @@ void SPI_TransmitCRC(SPI_TypeDef* SPIx)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Enables or disables the CRC value calculation of the transfered bytes.

+  * @brief  Enables or disables the CRC value calculation of the transferred bytes.

   * @param  SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.

   * @param  SPIx: where x can be 1, 2 or 3 to select the SPI peripheral.

   * @param  NewState: new state of the SPIx CRC value calculation.

   * @param  NewState: new state of the SPIx CRC value calculation.

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

@@ -866,7 +867,7 @@ ITStatus SPI_I2S_GetITStatus(SPI_TypeDef* SPIx, uint8_t SPI_I2S_IT)
 
   * @param  SPIx: where x can be

   * @param  SPIx: where x can be

   *   - 1, 2 or 3 in SPI mode 

   *   - 1, 2 or 3 in SPI mode 

   * @param  SPI_I2S_IT: specifies the SPI interrupt pending bit to clear.

   * @param  SPI_I2S_IT: specifies the SPI interrupt pending bit to clear.

-  *   This function clears only CRCERR intetrrupt pending bit.   

+  *   This function clears only CRCERR interrupt pending bit.   

   * @note

   * @note

   *   - OVR (OverRun Error) interrupt pending bit is cleared by software 

   *   - OVR (OverRun Error) interrupt pending bit is cleared by software 

   *     sequence: a read operation to SPI_DR register (SPI_I2S_ReceiveData()) 

   *     sequence: a read operation to SPI_DR register (SPI_I2S_ReceiveData()) 

@@ -904,4 +905,4 @@ void SPI_I2S_ClearITPendingBit(SPI_TypeDef* SPIx, uint8_t SPI_I2S_IT)
 
   * @}

   * @}

   */ 

   */ 

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 68 - 66
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_tim.c

   * @file    stm32f10x_tim.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the TIM firmware functions.

   * @brief   This file provides all the TIM firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_tim.h"

 #include "stm32f10x_tim.h"

@@ -215,10 +216,11 @@ void TIM_DeInit(TIM_TypeDef* TIMx)
 
 

 

 /**

 /**

   * @brief  Initializes the TIMx Time Base Unit peripheral according to 

   * @brief  Initializes the TIMx Time Base Unit peripheral according to 

-  *   the specified parameters in the TIM_TimeBaseInitStruct.

+  *         the specified parameters in the TIM_TimeBaseInitStruct.

   * @param  TIMx: where x can be 1 to 17 to select the TIM peripheral.

   * @param  TIMx: where x can be 1 to 17 to select the TIM peripheral.

   * @param  TIM_TimeBaseInitStruct: pointer to a TIM_TimeBaseInitTypeDef

   * @param  TIM_TimeBaseInitStruct: pointer to a TIM_TimeBaseInitTypeDef

-  *   structure that contains the configuration information for the specified TIM peripheral.

+  *         structure that contains the configuration information for the 

+  *         specified TIM peripheral.

   * @retval None

   * @retval None

   */

   */

 void TIM_TimeBaseInit(TIM_TypeDef* TIMx, TIM_TimeBaseInitTypeDef* TIM_TimeBaseInitStruct)

 void TIM_TimeBaseInit(TIM_TypeDef* TIMx, TIM_TimeBaseInitTypeDef* TIM_TimeBaseInitStruct)

@@ -268,10 +270,10 @@ void TIM_TimeBaseInit(TIM_TypeDef* TIMx, TIM_TimeBaseInitTypeDef* TIM_TimeBaseIn
 
 

 

 /**

 /**

   * @brief  Initializes the TIMx Channel1 according to the specified

   * @brief  Initializes the TIMx Channel1 according to the specified

-  *   parameters in the TIM_OCInitStruct.

+  *         parameters in the TIM_OCInitStruct.

   * @param  TIMx: where x can be  1 to 17 except 6 and 7 to select the TIM peripheral.

   * @param  TIMx: where x can be  1 to 17 except 6 and 7 to select the TIM peripheral.

   * @param  TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure

   * @param  TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure

-  *   that contains the configuration information for the specified TIM peripheral.

+  *         that contains the configuration information for the specified TIM peripheral.

   * @retval None

   * @retval None

   */

   */

 void TIM_OC1Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)

 void TIM_OC1Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)

@@ -326,7 +328,7 @@ void TIM_OC1Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
 
     /* Set the Output N State */

     /* Set the Output N State */

     tmpccer |= TIM_OCInitStruct->TIM_OutputNState;

     tmpccer |= TIM_OCInitStruct->TIM_OutputNState;

     

     

-    /* Reset the Ouput Compare and Output Compare N IDLE State */

+    /* Reset the Output Compare and Output Compare N IDLE State */

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS1));

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS1));

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS1N));

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS1N));

     

     

@@ -350,11 +352,11 @@ void TIM_OC1Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
 
 

 

 /**

 /**

   * @brief  Initializes the TIMx Channel2 according to the specified

   * @brief  Initializes the TIMx Channel2 according to the specified

-  *   parameters in the TIM_OCInitStruct.

+  *         parameters in the TIM_OCInitStruct.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 9, 12 or 15 to select 

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 9, 12 or 15 to select 

-  *   the TIM peripheral.

+  *         the TIM peripheral.

   * @param  TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure

   * @param  TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure

-  *   that contains the configuration information for the specified TIM peripheral.

+  *         that contains the configuration information for the specified TIM peripheral.

   * @retval None

   * @retval None

   */

   */

 void TIM_OC2Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)

 void TIM_OC2Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)

@@ -409,7 +411,7 @@ void TIM_OC2Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
 
     /* Set the Output N State */

     /* Set the Output N State */

     tmpccer |= (uint16_t)(TIM_OCInitStruct->TIM_OutputNState << 4);

     tmpccer |= (uint16_t)(TIM_OCInitStruct->TIM_OutputNState << 4);

     

     

-    /* Reset the Ouput Compare and Output Compare N IDLE State */

+    /* Reset the Output Compare and Output Compare N IDLE State */

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS2));

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS2));

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS2N));

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS2N));

     

     

@@ -433,10 +435,10 @@ void TIM_OC2Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
 
 

 

 /**

 /**

   * @brief  Initializes the TIMx Channel3 according to the specified

   * @brief  Initializes the TIMx Channel3 according to the specified

-  *   parameters in the TIM_OCInitStruct.

+  *         parameters in the TIM_OCInitStruct.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5 or 8 to select the TIM peripheral.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5 or 8 to select the TIM peripheral.

   * @param  TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure

   * @param  TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure

-  *   that contains the configuration information for the specified TIM peripheral.

+  *         that contains the configuration information for the specified TIM peripheral.

   * @retval None

   * @retval None

   */

   */

 void TIM_OC3Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)

 void TIM_OC3Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)

@@ -489,7 +491,7 @@ void TIM_OC3Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
 
     

     

     /* Set the Output N State */

     /* Set the Output N State */

     tmpccer |= (uint16_t)(TIM_OCInitStruct->TIM_OutputNState << 8);

     tmpccer |= (uint16_t)(TIM_OCInitStruct->TIM_OutputNState << 8);

-    /* Reset the Ouput Compare and Output Compare N IDLE State */

+    /* Reset the Output Compare and Output Compare N IDLE State */

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS3));

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS3));

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS3N));

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS3N));

     /* Set the Output Idle state */

     /* Set the Output Idle state */

@@ -512,10 +514,10 @@ void TIM_OC3Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
 
 

 

 /**

 /**

   * @brief  Initializes the TIMx Channel4 according to the specified

   * @brief  Initializes the TIMx Channel4 according to the specified

-  *   parameters in the TIM_OCInitStruct.

+  *         parameters in the TIM_OCInitStruct.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5 or 8 to select the TIM peripheral.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5 or 8 to select the TIM peripheral.

   * @param  TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure

   * @param  TIM_OCInitStruct: pointer to a TIM_OCInitTypeDef structure

-  *   that contains the configuration information for the specified TIM peripheral.

+  *         that contains the configuration information for the specified TIM peripheral.

   * @retval None

   * @retval None

   */

   */

 void TIM_OC4Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)

 void TIM_OC4Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)

@@ -556,7 +558,7 @@ void TIM_OC4Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
 
   if((TIMx == TIM1) || (TIMx == TIM8))

   if((TIMx == TIM1) || (TIMx == TIM8))

   {

   {

     assert_param(IS_TIM_OCIDLE_STATE(TIM_OCInitStruct->TIM_OCIdleState));

     assert_param(IS_TIM_OCIDLE_STATE(TIM_OCInitStruct->TIM_OCIdleState));

-    /* Reset the Ouput Compare IDLE State */

+    /* Reset the Output Compare IDLE State */

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS4));

     tmpcr2 &= (uint16_t)(~((uint16_t)TIM_CR2_OIS4));

     /* Set the Output Idle state */

     /* Set the Output Idle state */

     tmpcr2 |= (uint16_t)(TIM_OCInitStruct->TIM_OCIdleState << 6);

     tmpcr2 |= (uint16_t)(TIM_OCInitStruct->TIM_OCIdleState << 6);

@@ -576,10 +578,10 @@ void TIM_OC4Init(TIM_TypeDef* TIMx, TIM_OCInitTypeDef* TIM_OCInitStruct)
 
 

 

 /**

 /**

   * @brief  Initializes the TIM peripheral according to the specified

   * @brief  Initializes the TIM peripheral according to the specified

-  *   parameters in the TIM_ICInitStruct.

+  *         parameters in the TIM_ICInitStruct.

   * @param  TIMx: where x can be  1 to 17 except 6 and 7 to select the TIM peripheral.

   * @param  TIMx: where x can be  1 to 17 except 6 and 7 to select the TIM peripheral.

   * @param  TIM_ICInitStruct: pointer to a TIM_ICInitTypeDef structure

   * @param  TIM_ICInitStruct: pointer to a TIM_ICInitTypeDef structure

-  *   that contains the configuration information for the specified TIM peripheral.

+  *         that contains the configuration information for the specified TIM peripheral.

   * @retval None

   * @retval None

   */

   */

 void TIM_ICInit(TIM_TypeDef* TIMx, TIM_ICInitTypeDef* TIM_ICInitStruct)

 void TIM_ICInit(TIM_TypeDef* TIMx, TIM_ICInitTypeDef* TIM_ICInitStruct)

@@ -643,10 +645,10 @@ void TIM_ICInit(TIM_TypeDef* TIMx, TIM_ICInitTypeDef* TIM_ICInitStruct)
 
 

 

 /**

 /**

   * @brief  Configures the TIM peripheral according to the specified

   * @brief  Configures the TIM peripheral according to the specified

-  *   parameters in the TIM_ICInitStruct to measure an external PWM signal.

+  *         parameters in the TIM_ICInitStruct to measure an external PWM signal.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 9, 12 or 15 to select the TIM peripheral.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 9, 12 or 15 to select the TIM peripheral.

   * @param  TIM_ICInitStruct: pointer to a TIM_ICInitTypeDef structure

   * @param  TIM_ICInitStruct: pointer to a TIM_ICInitTypeDef structure

-  *   that contains the configuration information for the specified TIM peripheral.

+  *         that contains the configuration information for the specified TIM peripheral.

   * @retval None

   * @retval None

   */

   */

 void TIM_PWMIConfig(TIM_TypeDef* TIMx, TIM_ICInitTypeDef* TIM_ICInitStruct)

 void TIM_PWMIConfig(TIM_TypeDef* TIMx, TIM_ICInitTypeDef* TIM_ICInitStruct)

@@ -701,10 +703,10 @@ void TIM_PWMIConfig(TIM_TypeDef* TIMx, TIM_ICInitTypeDef* TIM_ICInitStruct)
 
 

 

 /**

 /**

   * @brief  Configures the: Break feature, dead time, Lock level, the OSSI,

   * @brief  Configures the: Break feature, dead time, Lock level, the OSSI,

-  *   the OSSR State and the AOE(automatic output enable).

+  *         the OSSR State and the AOE(automatic output enable).

   * @param  TIMx: where x can be  1 or 8 to select the TIM 

   * @param  TIMx: where x can be  1 or 8 to select the TIM 

   * @param  TIM_BDTRInitStruct: pointer to a TIM_BDTRInitTypeDef structure that

   * @param  TIM_BDTRInitStruct: pointer to a TIM_BDTRInitTypeDef structure that

-  *   contains the BDTR Register configuration  information for the TIM peripheral.

+  *         contains the BDTR Register configuration  information for the TIM peripheral.

   * @retval None

   * @retval None

   */

   */

 void TIM_BDTRConfig(TIM_TypeDef* TIMx, TIM_BDTRInitTypeDef *TIM_BDTRInitStruct)

 void TIM_BDTRConfig(TIM_TypeDef* TIMx, TIM_BDTRInitTypeDef *TIM_BDTRInitStruct)

@@ -728,7 +730,7 @@ void TIM_BDTRConfig(TIM_TypeDef* TIMx, TIM_BDTRInitTypeDef *TIM_BDTRInitStruct)
 
 /**

 /**

   * @brief  Fills each TIM_TimeBaseInitStruct member with its default value.

   * @brief  Fills each TIM_TimeBaseInitStruct member with its default value.

   * @param  TIM_TimeBaseInitStruct : pointer to a TIM_TimeBaseInitTypeDef

   * @param  TIM_TimeBaseInitStruct : pointer to a TIM_TimeBaseInitTypeDef

-  *   structure which will be initialized.

+  *         structure which will be initialized.

   * @retval None

   * @retval None

   */

   */

 void TIM_TimeBaseStructInit(TIM_TimeBaseInitTypeDef* TIM_TimeBaseInitStruct)

 void TIM_TimeBaseStructInit(TIM_TimeBaseInitTypeDef* TIM_TimeBaseInitStruct)

@@ -744,7 +746,7 @@ void TIM_TimeBaseStructInit(TIM_TimeBaseInitTypeDef* TIM_TimeBaseInitStruct)
 
 /**

 /**

   * @brief  Fills each TIM_OCInitStruct member with its default value.

   * @brief  Fills each TIM_OCInitStruct member with its default value.

   * @param  TIM_OCInitStruct : pointer to a TIM_OCInitTypeDef structure which will

   * @param  TIM_OCInitStruct : pointer to a TIM_OCInitTypeDef structure which will

-  *   be initialized.

+  *         be initialized.

   * @retval None

   * @retval None

   */

   */

 void TIM_OCStructInit(TIM_OCInitTypeDef* TIM_OCInitStruct)

 void TIM_OCStructInit(TIM_OCInitTypeDef* TIM_OCInitStruct)

@@ -762,8 +764,8 @@ void TIM_OCStructInit(TIM_OCInitTypeDef* TIM_OCInitStruct)
 
 

 

 /**

 /**

   * @brief  Fills each TIM_ICInitStruct member with its default value.

   * @brief  Fills each TIM_ICInitStruct member with its default value.

-  * @param  TIM_ICInitStruct : pointer to a TIM_ICInitTypeDef structure which will

-  *   be initialized.

+  * @param  TIM_ICInitStruct: pointer to a TIM_ICInitTypeDef structure which will

+  *         be initialized.

   * @retval None

   * @retval None

   */

   */

 void TIM_ICStructInit(TIM_ICInitTypeDef* TIM_ICInitStruct)

 void TIM_ICStructInit(TIM_ICInitTypeDef* TIM_ICInitStruct)

@@ -779,7 +781,7 @@ void TIM_ICStructInit(TIM_ICInitTypeDef* TIM_ICInitStruct)
 
 /**

 /**

   * @brief  Fills each TIM_BDTRInitStruct member with its default value.

   * @brief  Fills each TIM_BDTRInitStruct member with its default value.

   * @param  TIM_BDTRInitStruct: pointer to a TIM_BDTRInitTypeDef structure which

   * @param  TIM_BDTRInitStruct: pointer to a TIM_BDTRInitTypeDef structure which

-  *   will be initialized.

+  *         will be initialized.

   * @retval None

   * @retval None

   */

   */

 void TIM_BDTRStructInit(TIM_BDTRInitTypeDef* TIM_BDTRInitStruct)

 void TIM_BDTRStructInit(TIM_BDTRInitTypeDef* TIM_BDTRInitStruct)

@@ -915,21 +917,21 @@ void TIM_GenerateEvent(TIM_TypeDef* TIMx, uint16_t TIM_EventSource)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Configures the TIMx’s DMA interface.

+  * @brief  Configures the TIMx's DMA interface.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 15, 16 or 17 to select 

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 15, 16 or 17 to select 

   *   the TIM peripheral.

   *   the TIM peripheral.

   * @param  TIM_DMABase: DMA Base address.

   * @param  TIM_DMABase: DMA Base address.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg TIM_DMABase_CR, TIM_DMABase_CR2, TIM_DMABase_SMCR,

   *     @arg TIM_DMABase_CR, TIM_DMABase_CR2, TIM_DMABase_SMCR,

-  *   TIM_DMABase_DIER, TIM1_DMABase_SR, TIM_DMABase_EGR,

-  *   TIM_DMABase_CCMR1, TIM_DMABase_CCMR2, TIM_DMABase_CCER,

-  *   TIM_DMABase_CNT, TIM_DMABase_PSC, TIM_DMABase_ARR,

-  *   TIM_DMABase_RCR, TIM_DMABase_CCR1, TIM_DMABase_CCR2,

-  *   TIM_DMABase_CCR3, TIM_DMABase_CCR4, TIM_DMABase_BDTR,

-  *   TIM_DMABase_DCR.

+  *          TIM_DMABase_DIER, TIM1_DMABase_SR, TIM_DMABase_EGR,

+  *          TIM_DMABase_CCMR1, TIM_DMABase_CCMR2, TIM_DMABase_CCER,

+  *          TIM_DMABase_CNT, TIM_DMABase_PSC, TIM_DMABase_ARR,

+  *          TIM_DMABase_RCR, TIM_DMABase_CCR1, TIM_DMABase_CCR2,

+  *          TIM_DMABase_CCR3, TIM_DMABase_CCR4, TIM_DMABase_BDTR,

+  *          TIM_DMABase_DCR.

   * @param  TIM_DMABurstLength: DMA Burst length.

   * @param  TIM_DMABurstLength: DMA Burst length.

   *   This parameter can be one value between:

   *   This parameter can be one value between:

-  *   TIM_DMABurstLength_1Byte and TIM_DMABurstLength_18Bytes.

+  *   TIM_DMABurstLength_1Transfer and TIM_DMABurstLength_18Transfers.

   * @retval None

   * @retval None

   */

   */

 void TIM_DMAConfig(TIM_TypeDef* TIMx, uint16_t TIM_DMABase, uint16_t TIM_DMABurstLength)

 void TIM_DMAConfig(TIM_TypeDef* TIMx, uint16_t TIM_DMABase, uint16_t TIM_DMABurstLength)

@@ -943,7 +945,7 @@ void TIM_DMAConfig(TIM_TypeDef* TIMx, uint16_t TIM_DMABase, uint16_t TIM_DMABurs
 
 }

 }

 

 

 /**

 /**

-  * @brief  Enables or disables the TIMx’s DMA Requests.

+  * @brief  Enables or disables the TIMx's DMA Requests.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 6, 7, 8, 15, 16 or 17 

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 6, 7, 8, 15, 16 or 17 

   *   to select the TIM peripheral. 

   *   to select the TIM peripheral. 

   * @param  TIM_DMASource: specifies the DMA Request sources.

   * @param  TIM_DMASource: specifies the DMA Request sources.

@@ -979,9 +981,9 @@ void TIM_DMACmd(TIM_TypeDef* TIMx, uint16_t TIM_DMASource, FunctionalState NewSt
 
 }

 }

 

 

 /**

 /**

-  * @brief  Configures the TIMx interrnal Clock

+  * @brief  Configures the TIMx internal Clock

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 9, 12 or 15

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 9, 12 or 15

-  *   to select the TIM peripheral.

+  *         to select the TIM peripheral.

   * @retval None

   * @retval None

   */

   */

 void TIM_InternalClockConfig(TIM_TypeDef* TIMx)

 void TIM_InternalClockConfig(TIM_TypeDef* TIMx)

@@ -1250,11 +1252,11 @@ void TIM_SelectInputTrigger(TIM_TypeDef* TIMx, uint16_t TIM_InputTriggerSource)
 
   *     @arg TIM_EncoderMode_TI12: Counter counts on both TI1FP1 and TI2FP2 edges depending

   *     @arg TIM_EncoderMode_TI12: Counter counts on both TI1FP1 and TI2FP2 edges depending

   *                                on the level of the other input.

   *                                on the level of the other input.

   * @param  TIM_IC1Polarity: specifies the IC1 Polarity

   * @param  TIM_IC1Polarity: specifies the IC1 Polarity

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_ICPolarity_Falling: IC Falling edge.

   *     @arg TIM_ICPolarity_Falling: IC Falling edge.

   *     @arg TIM_ICPolarity_Rising: IC Rising edge.

   *     @arg TIM_ICPolarity_Rising: IC Rising edge.

   * @param  TIM_IC2Polarity: specifies the IC2 Polarity

   * @param  TIM_IC2Polarity: specifies the IC2 Polarity

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_ICPolarity_Falling: IC Falling edge.

   *     @arg TIM_ICPolarity_Falling: IC Falling edge.

   *     @arg TIM_ICPolarity_Rising: IC Rising edge.

   *     @arg TIM_ICPolarity_Rising: IC Rising edge.

   * @retval None

   * @retval None

@@ -1448,7 +1450,7 @@ void TIM_SelectCOM(TIM_TypeDef* TIMx, FunctionalState NewState)
 
 /**

 /**

   * @brief  Selects the TIMx peripheral Capture Compare DMA source.

   * @brief  Selects the TIMx peripheral Capture Compare DMA source.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 15, 16 or 17 to select 

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 15, 16 or 17 to select 

-  *   the TIM peripheral.

+  *         the TIM peripheral.

   * @param  NewState: new state of the Capture Compare DMA source

   * @param  NewState: new state of the Capture Compare DMA source

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

   * @retval None

   * @retval None

@@ -1473,7 +1475,7 @@ void TIM_SelectCCDMA(TIM_TypeDef* TIMx, FunctionalState NewState)
 
 /**

 /**

   * @brief  Sets or Resets the TIM peripheral Capture Compare Preload Control bit.

   * @brief  Sets or Resets the TIM peripheral Capture Compare Preload Control bit.

   * @param  TIMx: where x can be   1, 2, 3, 4, 5, 8 or 15 

   * @param  TIMx: where x can be   1, 2, 3, 4, 5, 8 or 15 

-  *   to select the TIMx peripheral

+  *         to select the TIMx peripheral

   * @param  NewState: new state of the Capture Compare Preload Control bit

   * @param  NewState: new state of the Capture Compare Preload Control bit

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

   * @retval None

   * @retval None

@@ -1522,7 +1524,7 @@ void TIM_OC1PreloadConfig(TIM_TypeDef* TIMx, uint16_t TIM_OCPreload)
 
 /**

 /**

   * @brief  Enables or disables the TIMx peripheral Preload register on CCR2.

   * @brief  Enables or disables the TIMx peripheral Preload register on CCR2.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 9, 12 or 15 to select 

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 9, 12 or 15 to select 

-  *   the TIM peripheral.

+  *         the TIM peripheral.

   * @param  TIM_OCPreload: new state of the TIMx peripheral Preload register

   * @param  TIM_OCPreload: new state of the TIMx peripheral Preload register

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg TIM_OCPreload_Enable

   *     @arg TIM_OCPreload_Enable

@@ -1620,7 +1622,7 @@ void TIM_OC1FastConfig(TIM_TypeDef* TIMx, uint16_t TIM_OCFast)
 
 /**

 /**

   * @brief  Configures the TIMx Output Compare 2 Fast feature.

   * @brief  Configures the TIMx Output Compare 2 Fast feature.

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 9, 12 or 15 to select 

   * @param  TIMx: where x can be  1, 2, 3, 4, 5, 8, 9, 12 or 15 to select 

-  *   the TIM peripheral.

+  *         the TIM peripheral.

   * @param  TIM_OCFast: new state of the Output Compare Fast Enable Bit.

   * @param  TIM_OCFast: new state of the Output Compare Fast Enable Bit.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg TIM_OCFast_Enable: TIM output compare fast enable

   *     @arg TIM_OCFast_Enable: TIM output compare fast enable

@@ -1795,7 +1797,7 @@ void TIM_ClearOC4Ref(TIM_TypeDef* TIMx, uint16_t TIM_OCClear)
 
   * @brief  Configures the TIMx channel 1 polarity.

   * @brief  Configures the TIMx channel 1 polarity.

   * @param  TIMx: where x can be 1 to 17 except 6 and 7 to select the TIM peripheral.

   * @param  TIMx: where x can be 1 to 17 except 6 and 7 to select the TIM peripheral.

   * @param  TIM_OCPolarity: specifies the OC1 Polarity

   * @param  TIM_OCPolarity: specifies the OC1 Polarity

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_OCPolarity_High: Output Compare active high

   *     @arg TIM_OCPolarity_High: Output Compare active high

   *     @arg TIM_OCPolarity_Low: Output Compare active low

   *     @arg TIM_OCPolarity_Low: Output Compare active low

   * @retval None

   * @retval None

@@ -1818,7 +1820,7 @@ void TIM_OC1PolarityConfig(TIM_TypeDef* TIMx, uint16_t TIM_OCPolarity)
 
   * @brief  Configures the TIMx Channel 1N polarity.

   * @brief  Configures the TIMx Channel 1N polarity.

   * @param  TIMx: where x can be 1, 8, 15, 16 or 17 to select the TIM peripheral.

   * @param  TIMx: where x can be 1, 8, 15, 16 or 17 to select the TIM peripheral.

   * @param  TIM_OCNPolarity: specifies the OC1N Polarity

   * @param  TIM_OCNPolarity: specifies the OC1N Polarity

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_OCNPolarity_High: Output Compare active high

   *     @arg TIM_OCNPolarity_High: Output Compare active high

   *     @arg TIM_OCNPolarity_Low: Output Compare active low

   *     @arg TIM_OCNPolarity_Low: Output Compare active low

   * @retval None

   * @retval None

@@ -1842,7 +1844,7 @@ void TIM_OC1NPolarityConfig(TIM_TypeDef* TIMx, uint16_t TIM_OCNPolarity)
 
   * @brief  Configures the TIMx channel 2 polarity.

   * @brief  Configures the TIMx channel 2 polarity.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5, 8, 9, 12 or 15 to select the TIM peripheral.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5, 8, 9, 12 or 15 to select the TIM peripheral.

   * @param  TIM_OCPolarity: specifies the OC2 Polarity

   * @param  TIM_OCPolarity: specifies the OC2 Polarity

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_OCPolarity_High: Output Compare active high

   *     @arg TIM_OCPolarity_High: Output Compare active high

   *     @arg TIM_OCPolarity_Low: Output Compare active low

   *     @arg TIM_OCPolarity_Low: Output Compare active low

   * @retval None

   * @retval None

@@ -1865,7 +1867,7 @@ void TIM_OC2PolarityConfig(TIM_TypeDef* TIMx, uint16_t TIM_OCPolarity)
 
   * @brief  Configures the TIMx Channel 2N polarity.

   * @brief  Configures the TIMx Channel 2N polarity.

   * @param  TIMx: where x can be 1 or 8 to select the TIM peripheral.

   * @param  TIMx: where x can be 1 or 8 to select the TIM peripheral.

   * @param  TIM_OCNPolarity: specifies the OC2N Polarity

   * @param  TIM_OCNPolarity: specifies the OC2N Polarity

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_OCNPolarity_High: Output Compare active high

   *     @arg TIM_OCNPolarity_High: Output Compare active high

   *     @arg TIM_OCNPolarity_Low: Output Compare active low

   *     @arg TIM_OCNPolarity_Low: Output Compare active low

   * @retval None

   * @retval None

@@ -1889,7 +1891,7 @@ void TIM_OC2NPolarityConfig(TIM_TypeDef* TIMx, uint16_t TIM_OCNPolarity)
 
   * @brief  Configures the TIMx channel 3 polarity.

   * @brief  Configures the TIMx channel 3 polarity.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM peripheral.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM peripheral.

   * @param  TIM_OCPolarity: specifies the OC3 Polarity

   * @param  TIM_OCPolarity: specifies the OC3 Polarity

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_OCPolarity_High: Output Compare active high

   *     @arg TIM_OCPolarity_High: Output Compare active high

   *     @arg TIM_OCPolarity_Low: Output Compare active low

   *     @arg TIM_OCPolarity_Low: Output Compare active low

   * @retval None

   * @retval None

@@ -1912,7 +1914,7 @@ void TIM_OC3PolarityConfig(TIM_TypeDef* TIMx, uint16_t TIM_OCPolarity)
 
   * @brief  Configures the TIMx Channel 3N polarity.

   * @brief  Configures the TIMx Channel 3N polarity.

   * @param  TIMx: where x can be 1 or 8 to select the TIM peripheral.

   * @param  TIMx: where x can be 1 or 8 to select the TIM peripheral.

   * @param  TIM_OCNPolarity: specifies the OC3N Polarity

   * @param  TIM_OCNPolarity: specifies the OC3N Polarity

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_OCNPolarity_High: Output Compare active high

   *     @arg TIM_OCNPolarity_High: Output Compare active high

   *     @arg TIM_OCNPolarity_Low: Output Compare active low

   *     @arg TIM_OCNPolarity_Low: Output Compare active low

   * @retval None

   * @retval None

@@ -1937,7 +1939,7 @@ void TIM_OC3NPolarityConfig(TIM_TypeDef* TIMx, uint16_t TIM_OCNPolarity)
 
   * @brief  Configures the TIMx channel 4 polarity.

   * @brief  Configures the TIMx channel 4 polarity.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM peripheral.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM peripheral.

   * @param  TIM_OCPolarity: specifies the OC4 Polarity

   * @param  TIM_OCPolarity: specifies the OC4 Polarity

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_OCPolarity_High: Output Compare active high

   *     @arg TIM_OCPolarity_High: Output Compare active high

   *     @arg TIM_OCPolarity_Low: Output Compare active low

   *     @arg TIM_OCPolarity_Low: Output Compare active low

   * @retval None

   * @retval None

@@ -1960,7 +1962,7 @@ void TIM_OC4PolarityConfig(TIM_TypeDef* TIMx, uint16_t TIM_OCPolarity)
 
   * @brief  Enables or disables the TIM Capture Compare Channel x.

   * @brief  Enables or disables the TIM Capture Compare Channel x.

   * @param  TIMx: where x can be 1 to 17 except 6 and 7 to select the TIM peripheral.

   * @param  TIMx: where x can be 1 to 17 except 6 and 7 to select the TIM peripheral.

   * @param  TIM_Channel: specifies the TIM Channel

   * @param  TIM_Channel: specifies the TIM Channel

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_Channel_1: TIM Channel 1

   *     @arg TIM_Channel_1: TIM Channel 1

   *     @arg TIM_Channel_2: TIM Channel 2

   *     @arg TIM_Channel_2: TIM Channel 2

   *     @arg TIM_Channel_3: TIM Channel 3

   *     @arg TIM_Channel_3: TIM Channel 3

@@ -1991,7 +1993,7 @@ void TIM_CCxCmd(TIM_TypeDef* TIMx, uint16_t TIM_Channel, uint16_t TIM_CCx)
 
   * @brief  Enables or disables the TIM Capture Compare Channel xN.

   * @brief  Enables or disables the TIM Capture Compare Channel xN.

   * @param  TIMx: where x can be 1, 8, 15, 16 or 17 to select the TIM peripheral.

   * @param  TIMx: where x can be 1, 8, 15, 16 or 17 to select the TIM peripheral.

   * @param  TIM_Channel: specifies the TIM Channel

   * @param  TIM_Channel: specifies the TIM Channel

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_Channel_1: TIM Channel 1

   *     @arg TIM_Channel_1: TIM Channel 1

   *     @arg TIM_Channel_2: TIM Channel 2

   *     @arg TIM_Channel_2: TIM Channel 2

   *     @arg TIM_Channel_3: TIM Channel 3

   *     @arg TIM_Channel_3: TIM Channel 3

@@ -2018,19 +2020,19 @@ void TIM_CCxNCmd(TIM_TypeDef* TIMx, uint16_t TIM_Channel, uint16_t TIM_CCxN)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Selects the TIM Ouput Compare Mode.

-  * @note   This function disables the selected channel before changing the Ouput

+  * @brief  Selects the TIM Output Compare Mode.

+  * @note   This function disables the selected channel before changing the Output

   *         Compare Mode.

   *         Compare Mode.

   *         User has to enable this channel using TIM_CCxCmd and TIM_CCxNCmd functions.

   *         User has to enable this channel using TIM_CCxCmd and TIM_CCxNCmd functions.

   * @param  TIMx: where x can be 1 to 17 except 6 and 7 to select the TIM peripheral.

   * @param  TIMx: where x can be 1 to 17 except 6 and 7 to select the TIM peripheral.

   * @param  TIM_Channel: specifies the TIM Channel

   * @param  TIM_Channel: specifies the TIM Channel

-  *   This parmeter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_Channel_1: TIM Channel 1

   *     @arg TIM_Channel_1: TIM Channel 1

   *     @arg TIM_Channel_2: TIM Channel 2

   *     @arg TIM_Channel_2: TIM Channel 2

   *     @arg TIM_Channel_3: TIM Channel 3

   *     @arg TIM_Channel_3: TIM Channel 3

   *     @arg TIM_Channel_4: TIM Channel 4

   *     @arg TIM_Channel_4: TIM Channel 4

   * @param  TIM_OCMode: specifies the TIM Output Compare Mode.

   * @param  TIM_OCMode: specifies the TIM Output Compare Mode.

-  *   This paramter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_OCMode_Timing

   *     @arg TIM_OCMode_Timing

   *     @arg TIM_OCMode_Active

   *     @arg TIM_OCMode_Active

   *     @arg TIM_OCMode_Toggle

   *     @arg TIM_OCMode_Toggle

@@ -2133,7 +2135,7 @@ void TIM_UpdateRequestConfig(TIM_TypeDef* TIMx, uint16_t TIM_UpdateSource)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Enables or disables the TIMx’s Hall sensor interface.

+  * @brief  Enables or disables the TIMx's Hall sensor interface.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM peripheral.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5 or 8 to select the TIM peripheral.

   * @param  NewState: new state of the TIMx Hall sensor interface.

   * @param  NewState: new state of the TIMx Hall sensor interface.

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

@@ -2157,7 +2159,7 @@ void TIM_SelectHallSensor(TIM_TypeDef* TIMx, FunctionalState NewState)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Selects the TIMx’s One Pulse Mode.

+  * @brief  Selects the TIMx's One Pulse Mode.

   * @param  TIMx: where x can be 1 to 17 to select the TIM peripheral.

   * @param  TIMx: where x can be 1 to 17 to select the TIM peripheral.

   * @param  TIM_OPMode: specifies the OPM Mode to be used.

   * @param  TIM_OPMode: specifies the OPM Mode to be used.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

@@ -2212,7 +2214,7 @@ void TIM_SelectOutputTrigger(TIM_TypeDef* TIMx, uint16_t TIM_TRGOSource)
 
   * @brief  Selects the TIMx Slave Mode.

   * @brief  Selects the TIMx Slave Mode.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5, 8, 9, 12 or 15 to select the TIM peripheral.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5, 8, 9, 12 or 15 to select the TIM peripheral.

   * @param  TIM_SlaveMode: specifies the Timer Slave Mode.

   * @param  TIM_SlaveMode: specifies the Timer Slave Mode.

-  *   This paramter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_SlaveMode_Reset: Rising edge of the selected trigger signal (TRGI) re-initializes

   *     @arg TIM_SlaveMode_Reset: Rising edge of the selected trigger signal (TRGI) re-initializes

   *                               the counter and triggers an update of the registers.

   *                               the counter and triggers an update of the registers.

   *     @arg TIM_SlaveMode_Gated:     The counter clock is enabled when the trigger signal (TRGI) is high.

   *     @arg TIM_SlaveMode_Gated:     The counter clock is enabled when the trigger signal (TRGI) is high.

@@ -2235,7 +2237,7 @@ void TIM_SelectSlaveMode(TIM_TypeDef* TIMx, uint16_t TIM_SlaveMode)
 
   * @brief  Sets or Resets the TIMx Master/Slave Mode.

   * @brief  Sets or Resets the TIMx Master/Slave Mode.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5, 8, 9, 12 or 15 to select the TIM peripheral.

   * @param  TIMx: where x can be 1, 2, 3, 4, 5, 8, 9, 12 or 15 to select the TIM peripheral.

   * @param  TIM_MasterSlaveMode: specifies the Timer Master Slave Mode.

   * @param  TIM_MasterSlaveMode: specifies the Timer Master Slave Mode.

-  *   This paramter can be one of the following values:

+  *   This parameter can be one of the following values:

   *     @arg TIM_MasterSlaveMode_Enable: synchronization between the current timer

   *     @arg TIM_MasterSlaveMode_Enable: synchronization between the current timer

   *                                      and its slaves (through TRGO).

   *                                      and its slaves (through TRGO).

   *     @arg TIM_MasterSlaveMode_Disable: No action

   *     @arg TIM_MasterSlaveMode_Disable: No action

@@ -2885,4 +2887,4 @@ static void TI4_Config(TIM_TypeDef* TIMx, uint16_t TIM_ICPolarity, uint16_t TIM_
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 28 - 25
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_usart.c

   * @file    stm32f10x_usart.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the USART firmware functions.

   * @brief   This file provides all the USART firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_usart.h"

 #include "stm32f10x_usart.h"

@@ -122,7 +123,8 @@
 
 /**

 /**

   * @brief  Deinitializes the USARTx peripheral registers to their default reset values.

   * @brief  Deinitializes the USARTx peripheral registers to their default reset values.

   * @param  USARTx: Select the USART or the UART peripheral. 

   * @param  USARTx: Select the USART or the UART peripheral. 

-  *   This parameter can be one of the following values: USART1, USART2, USART3, UART4 or UART5.

+  *   This parameter can be one of the following values: 

+  *      USART1, USART2, USART3, UART4 or UART5.

   * @retval None

   * @retval None

   */

   */

 void USART_DeInit(USART_TypeDef* USARTx)

 void USART_DeInit(USART_TypeDef* USARTx)

@@ -162,12 +164,13 @@ void USART_DeInit(USART_TypeDef* USARTx)
 
 

 

 /**

 /**

   * @brief  Initializes the USARTx peripheral according to the specified

   * @brief  Initializes the USARTx peripheral according to the specified

-  *   parameters in the USART_InitStruct .

+  *         parameters in the USART_InitStruct .

   * @param  USARTx: Select the USART or the UART peripheral. 

   * @param  USARTx: Select the USART or the UART peripheral. 

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *   USART1, USART2, USART3, UART4 or UART5.

   *   USART1, USART2, USART3, UART4 or UART5.

   * @param  USART_InitStruct: pointer to a USART_InitTypeDef structure

   * @param  USART_InitStruct: pointer to a USART_InitTypeDef structure

-  *   that contains the configuration information for the specified USART peripheral.

+  *         that contains the configuration information for the specified USART 

+  *         peripheral.

   * @retval None

   * @retval None

   */

   */

 void USART_Init(USART_TypeDef* USARTx, USART_InitTypeDef* USART_InitStruct)

 void USART_Init(USART_TypeDef* USARTx, USART_InitTypeDef* USART_InitStruct)

@@ -272,7 +275,7 @@ void USART_Init(USART_TypeDef* USARTx, USART_InitTypeDef* USART_InitStruct)
 
 /**

 /**

   * @brief  Fills each USART_InitStruct member with its default value.

   * @brief  Fills each USART_InitStruct member with its default value.

   * @param  USART_InitStruct: pointer to a USART_InitTypeDef structure

   * @param  USART_InitStruct: pointer to a USART_InitTypeDef structure

-  *   which will be initialized.

+  *         which will be initialized.

   * @retval None

   * @retval None

   */

   */

 void USART_StructInit(USART_InitTypeDef* USART_InitStruct)

 void USART_StructInit(USART_InitTypeDef* USART_InitStruct)

@@ -288,12 +291,12 @@ void USART_StructInit(USART_InitTypeDef* USART_InitStruct)
 
 

 

 /**

 /**

   * @brief  Initializes the USARTx peripheral Clock according to the 

   * @brief  Initializes the USARTx peripheral Clock according to the 

-  *   specified parameters in the USART_ClockInitStruct .

+  *          specified parameters in the USART_ClockInitStruct .

   * @param  USARTx: where x can be 1, 2, 3 to select the USART peripheral.

   * @param  USARTx: where x can be 1, 2, 3 to select the USART peripheral.

   * @param  USART_ClockInitStruct: pointer to a USART_ClockInitTypeDef

   * @param  USART_ClockInitStruct: pointer to a USART_ClockInitTypeDef

-  *   structure that contains the configuration information for the specified 

-  *   USART peripheral.  

-  * @note The Smart Card mode is not available for UART4 and UART5.

+  *         structure that contains the configuration information for the specified 

+  *         USART peripheral.  

+  * @note The Smart Card and Synchronous modes are not available for UART4 and UART5.

   * @retval None

   * @retval None

   */

   */

 void USART_ClockInit(USART_TypeDef* USARTx, USART_ClockInitTypeDef* USART_ClockInitStruct)

 void USART_ClockInit(USART_TypeDef* USARTx, USART_ClockInitTypeDef* USART_ClockInitStruct)

@@ -324,7 +327,7 @@ void USART_ClockInit(USART_TypeDef* USARTx, USART_ClockInitTypeDef* USART_ClockI
 
 /**

 /**

   * @brief  Fills each USART_ClockInitStruct member with its default value.

   * @brief  Fills each USART_ClockInitStruct member with its default value.

   * @param  USART_ClockInitStruct: pointer to a USART_ClockInitTypeDef

   * @param  USART_ClockInitStruct: pointer to a USART_ClockInitTypeDef

-  *   structure which will be initialized.

+  *         structure which will be initialized.

   * @retval None

   * @retval None

   */

   */

 void USART_ClockStructInit(USART_ClockInitTypeDef* USART_ClockInitStruct)

 void USART_ClockStructInit(USART_ClockInitTypeDef* USART_ClockInitStruct)

@@ -339,10 +342,10 @@ void USART_ClockStructInit(USART_ClockInitTypeDef* USART_ClockInitStruct)
 
 /**

 /**

   * @brief  Enables or disables the specified USART peripheral.

   * @brief  Enables or disables the specified USART peripheral.

   * @param  USARTx: Select the USART or the UART peripheral. 

   * @param  USARTx: Select the USART or the UART peripheral. 

-  *   This parameter can be one of the following values:

-  *   USART1, USART2, USART3, UART4 or UART5.

+  *         This parameter can be one of the following values:

+  *           USART1, USART2, USART3, UART4 or UART5.

   * @param  NewState: new state of the USARTx peripheral.

   * @param  NewState: new state of the USARTx peripheral.

-  *   This parameter can be: ENABLE or DISABLE.

+  *         This parameter can be: ENABLE or DISABLE.

   * @retval None

   * @retval None

   */

   */

 void USART_Cmd(USART_TypeDef* USARTx, FunctionalState NewState)

 void USART_Cmd(USART_TypeDef* USARTx, FunctionalState NewState)

@@ -372,7 +375,7 @@ void USART_Cmd(USART_TypeDef* USARTx, FunctionalState NewState)
 
   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *     @arg USART_IT_CTS:  CTS change interrupt (not available for UART4 and UART5)

   *     @arg USART_IT_CTS:  CTS change interrupt (not available for UART4 and UART5)

   *     @arg USART_IT_LBD:  LIN Break detection interrupt

   *     @arg USART_IT_LBD:  LIN Break detection interrupt

-  *     @arg USART_IT_TXE:  Tansmit Data Register empty interrupt

+  *     @arg USART_IT_TXE:  Transmit Data Register empty interrupt

   *     @arg USART_IT_TC:   Transmission complete interrupt

   *     @arg USART_IT_TC:   Transmission complete interrupt

   *     @arg USART_IT_RXNE: Receive Data register not empty interrupt

   *     @arg USART_IT_RXNE: Receive Data register not empty interrupt

   *     @arg USART_IT_IDLE: Idle line detection interrupt

   *     @arg USART_IT_IDLE: Idle line detection interrupt

@@ -749,7 +752,7 @@ void USART_HalfDuplexCmd(USART_TypeDef* USARTx, FunctionalState NewState)
 
   * @param  USARTx: Select the USART or the UART peripheral.

   * @param  USARTx: Select the USART or the UART peripheral.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *   USART1, USART2, USART3, UART4 or UART5.

   *   USART1, USART2, USART3, UART4 or UART5.

-  * @param  NewState: new state of the USART one bit sampling methode.

+  * @param  NewState: new state of the USART one bit sampling method.

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

   * @note

   * @note

   *     This function has to be called before calling USART_Init()

   *     This function has to be called before calling USART_Init()

@@ -775,11 +778,11 @@ void USART_OverSampling8Cmd(USART_TypeDef* USARTx, FunctionalState NewState)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Enables or disables the USART's one bit sampling methode.

+  * @brief  Enables or disables the USART's one bit sampling method.

   * @param  USARTx: Select the USART or the UART peripheral.

   * @param  USARTx: Select the USART or the UART peripheral.

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *   USART1, USART2, USART3, UART4 or UART5.

   *   USART1, USART2, USART3, UART4 or UART5.

-  * @param  NewState: new state of the USART one bit sampling methode.

+  * @param  NewState: new state of the USART one bit sampling method.

   *   This parameter can be: ENABLE or DISABLE.

   *   This parameter can be: ENABLE or DISABLE.

   * @retval None

   * @retval None

   */

   */

@@ -802,7 +805,7 @@ void USART_OneBitMethodCmd(USART_TypeDef* USARTx, FunctionalState NewState)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Configures the USART’s IrDA interface.

+  * @brief  Configures the USART's IrDA interface.

   * @param  USARTx: Select the USART or the UART peripheral. 

   * @param  USARTx: Select the USART or the UART peripheral. 

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *   USART1, USART2, USART3, UART4 or UART5.

   *   USART1, USART2, USART3, UART4 or UART5.

@@ -823,7 +826,7 @@ void USART_IrDAConfig(USART_TypeDef* USARTx, uint16_t USART_IrDAMode)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Enables or disables the USART’s IrDA interface.

+  * @brief  Enables or disables the USART's IrDA interface.

   * @param  USARTx: Select the USART or the UART peripheral. 

   * @param  USARTx: Select the USART or the UART peripheral. 

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *   USART1, USART2, USART3, UART4 or UART5.

   *   USART1, USART2, USART3, UART4 or UART5.

@@ -998,7 +1001,7 @@ ITStatus USART_GetITStatus(USART_TypeDef* USARTx, uint16_t USART_IT)
 
 }

 }

 

 

 /**

 /**

-  * @brief  Clears the USARTx’s interrupt pending bits.

+  * @brief  Clears the USARTx's interrupt pending bits.

   * @param  USARTx: Select the USART or the UART peripheral. 

   * @param  USARTx: Select the USART or the UART peripheral. 

   *   This parameter can be one of the following values:

   *   This parameter can be one of the following values:

   *   USART1, USART2, USART3, UART4 or UART5.

   *   USART1, USART2, USART3, UART4 or UART5.

@@ -1052,4 +1055,4 @@ void USART_ClearITPendingBit(USART_TypeDef* USARTx, uint16_t USART_IT)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

+ 7 - 6
bsp/stm32f10x/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c
查看文件 

@@ -2,11 +2,11 @@
 
   ******************************************************************************

   ******************************************************************************

   * @file    stm32f10x_wwdg.c

   * @file    stm32f10x_wwdg.c

   * @author  MCD Application Team

   * @author  MCD Application Team

-  * @version V3.4.0

-  * @date    10/15/2010

+  * @version V3.5.0

+  * @date    11-March-2011

   * @brief   This file provides all the WWDG firmware functions.

   * @brief   This file provides all the WWDG firmware functions.

   ******************************************************************************

   ******************************************************************************

-  * @copy

+  * @attention

   *

   *

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

   * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE

@@ -15,8 +15,9 @@
 
   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.

   *

   *

-  * <h2><center>&copy; COPYRIGHT 2010 STMicroelectronics</center></h2>

-  */ 

+  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>

+  ******************************************************************************

+  */

 

 

 /* Includes ------------------------------------------------------------------*/

 /* Includes ------------------------------------------------------------------*/

 #include "stm32f10x_wwdg.h"

 #include "stm32f10x_wwdg.h"

@@ -220,4 +221,4 @@ void WWDG_ClearFlag(void)
 
   * @}

   * @}

   */

   */

 

 

-/******************* (C) COPYRIGHT 2010 STMicroelectronics *****END OF FILE****/

+/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/

部分文件因文件數量過多而無法顯示