Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NuttX RTOS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
f4grx
NuttX RTOS
Commits
db1b3c42
Commit
db1b3c42
authored
11 years ago
by
Gregory Nutt
Browse files
Options
Downloads
Patches
Plain Diff
SourceForge bug #16 Fix IO pin map. Add CONFIG_SERIAL_TERMIOS support. From CCTSAO
parent
bdc7d052
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ChangeLog
+4
-0
4 additions, 0 deletions
ChangeLog
arch/arm/src/stm32/chip/stm32f40xxx_pinmap.h
+1
-1
1 addition, 1 deletion
arch/arm/src/stm32/chip/stm32f40xxx_pinmap.h
include/nuttx/serial/serial.h
+22
-0
22 additions, 0 deletions
include/nuttx/serial/serial.h
with
27 additions
and
1 deletion
ChangeLog
+
4
−
0
View file @
db1b3c42
...
...
@@ -5427,4 +5427,8 @@
* nuttx/arch/arm/src/sama5/sam_ehci.c: Now code complete for all
asynchronous endpoints (control and bulk); nothing yet in place
for periodic endponts (interrupt and isochronous) (2013-8-22).
* include/nuttx/serial/serial.h and arch/arm/src/stm32/chip/stm32f40xxx_pinmap.h:
SourceForge bug #16 Fix IO pin map. Add CONFIG_SERIAL_TERMIOS support.
Also fixes some STM32 F4 Timer 8 pin configurations. From CCTSAO
(2013-8-23).
This diff is collapsed.
Click to expand it.
arch/arm/src/stm32/chip/stm32f40xxx_pinmap.h
+
1
−
1
View file @
db1b3c42
...
...
@@ -615,7 +615,7 @@
#define GPIO_TIM8_CH2N_2 (GPIO_ALT|GPIO_AF3|GPIO_PORTB|GPIO_PIN14)
#define GPIO_TIM8_CH2N_3 (GPIO_ALT|GPIO_AF3|GPIO_PORTH|GPIO_PIN14)
#define GPIO_TIM8_CH3N_1 (GPIO_ALT|GPIO_AF3|GPIO_PORTB|GPIO_PIN1)
#define GPIO_TIM8_CH3N_2 (GPIO_ALT|GPIO_AF3|GPIO_PORT
C
|GPIO_PIN15)
#define GPIO_TIM8_CH3N_2 (GPIO_ALT|GPIO_AF3|GPIO_PORT
B
|GPIO_PIN15)
#define GPIO_TIM8_CH3N_3 (GPIO_ALT|GPIO_AF3|GPIO_PORTH|GPIO_PIN15)
#define GPIO_TIM8_CH3IN_1 (GPIO_ALT|GPIO_AF3|GPIO_SPEED_50MHz|GPIO_FLOAT|GPIO_PORTC|GPIO_PIN8)
#define GPIO_TIM8_CH3IN_2 (GPIO_ALT|GPIO_AF3|GPIO_SPEED_50MHz|GPIO_FLOAT|GPIO_PORTI|GPIO_PIN7)
...
...
This diff is collapsed.
Click to expand it.
include/nuttx/serial/serial.h
+
22
−
0
View file @
db1b3c42
...
...
@@ -46,6 +46,9 @@
#include
<stdint.h>
#include
<stdbool.h>
#include
<semaphore.h>
#ifdef CONFIG_SERIAL_TERMIOS
# include <termios.h>
#endif
#include
<nuttx/fs/fs.h>
...
...
@@ -191,6 +194,8 @@ struct uart_ops_s
struct
uart_dev_s
{
/* State data */
uint8_t
open_count
;
/* Number of times the device has been opened */
volatile
bool
xmitwaiting
;
/* true: User waiting for space in xmit.buffer */
volatile
bool
recvwaiting
;
/* true: User waiting for data in recv.buffer */
...
...
@@ -198,14 +203,31 @@ struct uart_dev_s
volatile
bool
disconnected
;
/* true: Removable device is not connected */
#endif
bool
isconsole
;
/* true: This is the serial console */
/* Terminal control flags */
#ifdef CONFIG_SERIAL_TERMIOS
tcflag_t
tc_iflag
;
/* Input modes */
tcflag_t
tc_oflag
;
/* Output modes */
tcflag_t
tc_lflag
;
/* Local modes */
#endif
/* Semaphores */
sem_t
closesem
;
/* Locks out new open while close is in progress */
sem_t
xmitsem
;
/* Wakeup user waiting for space in xmit.buffer */
sem_t
recvsem
;
/* Wakeup user waiting for data in recv.buffer */
#ifndef CONFIG_DISABLE_POLL
sem_t
pollsem
;
/* Manages exclusive access to fds[] */
#endif
/* I/O buffers */
struct
uart_buffer_s
xmit
;
/* Describes transmit buffer */
struct
uart_buffer_s
recv
;
/* Describes receive buffer */
/* Driver interface */
FAR
const
struct
uart_ops_s
*
ops
;
/* Arch-specific operations */
FAR
void
*
priv
;
/* Used by the arch-specific logic */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment