Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix a critical PIC32 GPIO configuration bug

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4867 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-06-25 15:24:52 +00:00
parent cd6492dc73
commit 0c7871edd1
4 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3
View File
@@ -2923,5 +2923,8 @@
the Mirtoo module. the Mirtoo module.
* configs/mirtoo/scripts: Move all Mirtoo linker scripts to a common * configs/mirtoo/scripts: Move all Mirtoo linker scripts to a common
directory. directory.
* arch/mips/src/pic32mx/pic32mx-gpio.c: All digital inputs were being
configured as outputs. This is a *critical* bug fix and needs to be
incorporated by any PIC32 users.
Documentation/NxWidgets.html
+20 -1
View File
@@ -57,7 +57,26 @@
</p> </p>
<h1>NXWidgets DOxygen Documentation</h1> <h1>NXWidgets DOxygen Documentation</h1>
<p> <p>
DOxygen documentation for the NxWidgets-1.0 is now available online at <a href="http://www.nx-engineering.com/nxwidgets_v1_0/">this location</a>. Release notes, DOxygen documentation, as well as downloads for the latest NxWidgets releases are available online:
</p>
<ul>
<li>
<b>NxWidgets-1.0</b>:
<a href="http://www.nx-engineering.com/nxwidgets_v1_0/">Documentation</a>, and
<a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.0/">Downloads</a>
</li>
<li>
<b>NxWidgets-1.1</b>:
<a href="http://www.nx-engineering.com/nxwidgets_v1_1/">Documentation</a>,
<a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.1/">Release notes</a>, and
<a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.1/">Downloads</a>
</li>
<li>
<b>NxWidgets-1.2</b>:
<a href="http://www.nx-engineering.com/nxwidgets_v1_2/">Documentation</a>,
<a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.2/">Release notes</a>, and
<a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.2/">Downloads</a>
</li>
</p> </p>
<p> <p>
Thanks go to Jose Pablo Carballo for contributing this! Thanks go to Jose Pablo Carballo for contributing this!
arch/mips/src/pic32mx/pic32mx-gpio.c
+3 -5
View File
@@ -160,7 +160,7 @@ int pic32mx_configgpio(uint16_t cfgset)
sched_lock(); sched_lock();
if (pic32mx_output(cfgset)) if (pic32mx_output(cfgset))
{ {
/* It is an output; set the corresponding bit in the TRIS register */ /* It is an output; clear the corresponding bit in the TRIS register */
putreg32(1 << pin, base + PIC32MX_IOPORT_TRISCLR_OFFSET); putreg32(1 << pin, base + PIC32MX_IOPORT_TRISCLR_OFFSET);
@@ -189,11 +189,9 @@ int pic32mx_configgpio(uint16_t cfgset)
} }
else else
{ {
/* It is an input; clear the corresponding bit in the TRIS /* It is an input; set the corresponding bit in the TRIS register. */
* register.
*/
putreg32(1 << pin, base + PIC32MX_IOPORT_TRISCLR_OFFSET); putreg32(1 << pin, base + PIC32MX_IOPORT_TRISSET_OFFSET);
putreg32(1 << pin, base + PIC32MX_IOPORT_ODCCLR_OFFSET); putreg32(1 << pin, base + PIC32MX_IOPORT_ODCCLR_OFFSET);
} }
arch/mips/src/pic32mx/pic32mx-ioport.h
+1
View File
@@ -73,6 +73,7 @@
# define PIC32MX_IOPORT_ODCCLR_OFFSET 0x0044 /* Open drain control clear register */ # define PIC32MX_IOPORT_ODCCLR_OFFSET 0x0044 /* Open drain control clear register */
# define PIC32MX_IOPORT_ODCSET_OFFSET 0x0048 /* Open drain control set register */ # define PIC32MX_IOPORT_ODCSET_OFFSET 0x0048 /* Open drain control set register */
# define PIC32MX_IOPORT_ODCINV_OFFSET 0x004c /* Open drain control invert register */ # define PIC32MX_IOPORT_ODCINV_OFFSET 0x004c /* Open drain control invert register */
# define PIC32MX_IOPORT_CNPU_OFFSET 0x0050 /* Change Notification Pull-up register */ # define PIC32MX_IOPORT_CNPU_OFFSET 0x0050 /* Change Notification Pull-up register */
# define PIC32MX_IOPORT_CNPUCLR_OFFSET 0x0054 /* Change Notification Pull-up clear register */ # define PIC32MX_IOPORT_CNPUCLR_OFFSET 0x0054 /* Change Notification Pull-up clear register */
# define PIC32MX_IOPORT_CNPUSET_OFFSET 0x0058 /* Change Notification Pull-up set register */ # define PIC32MX_IOPORT_CNPUSET_OFFSET 0x0058 /* Change Notification Pull-up set register */