sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in HeathPetersen/nuttx (pull request #96)

Browse Source 
Master
This commit is contained in:
Gregory Nutt 2016-07-12 06:27:15 -06:00
commit 765098d840
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/qemu-i486/nsh/Make.defs
View File

@ -71,7 +71,7 @@ ARCHDEFINES =
# Check if building a 32-bit target with a 64-bit toolchain # Check if building a 32-bit target with a 64-bit toolchain
ifeq ($(ARCH_X86_M32),y) ifeq ($(CONFIG_ARCH_X86_M32),y)
ARCHCPUFLAGS += -m32 ARCHCPUFLAGS += -m32
endif endif

2
configs/qemu-i486/ostest/Make.defs
View File

@ -71,7 +71,7 @@ ARCHDEFINES =
# Check if building a 32-bit target with a 64-bit toolchain # Check if building a 32-bit target with a 64-bit toolchain
ifeq ($(ARCH_X86_M32),y) ifeq ($(CONFIG_ARCH_X86_M32),y)
ARCHCPUFLAGS += -m32 ARCHCPUFLAGS += -m32
endif endif

5
drivers/serial/uart_16550.c
View File

@ -871,14 +871,17 @@ static int u16550_ioctl(struct file *filep, int cmd, unsigned long arg)
struct inode *inode = filep->f_inode; struct inode *inode = filep->f_inode;
struct uart_dev_s *dev = inode->i_private; struct uart_dev_s *dev = inode->i_private;
struct u16550_s *priv = (FAR struct u16550_s *)dev->priv; struct u16550_s *priv = (FAR struct u16550_s *)dev->priv;
int ret;
#ifdef CONFIG_SERIAL_UART_ARCH_IOCTL #ifdef CONFIG_SERIAL_UART_ARCH_IOCTL
int ret = uart_ioctl(filep, cmd, arg); ret = uart_ioctl(filep, cmd, arg);
if (ret != -ENOTTY) if (ret != -ENOTTY)
{ {
return ret; return ret;
} }
#else
ret = OK;
#endif #endif
switch (cmd) switch (cmd)