diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-25 15:52:48 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-25 15:52:48 -0600 |
| commit | bbf5ee648636273bf194f5e9a8004ea45d4cb009 (patch) | |
| tree | 369cb9cd255683303cb8df3bdf008a75393d5f23 /nuttx/arch/arm/src/lpc214x | |
| parent | 561c54964b2c99b1709fa79ee98aea31e7d7d449 (diff) | |
| download | px4-nuttx-bbf5ee648636273bf194f5e9a8004ea45d4cb009.tar.gz px4-nuttx-bbf5ee648636273bf194f5e9a8004ea45d4cb009.tar.bz2 px4-nuttx-bbf5ee648636273bf194f5e9a8004ea45d4cb009.zip | |
Useless TIOCSERGSTRUCT logic in most serial drivers is not compiled unless CONFIG_DEBUG and CONFIG_SERIAL_TIOCSERGSTRUCT are defined
Diffstat (limited to 'nuttx/arch/arm/src/lpc214x')
| -rw-r--r-- | nuttx/arch/arm/src/lpc214x/Kconfig | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/lpc214x/lpc214x_serial.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/lpc214x/Kconfig b/nuttx/arch/arm/src/lpc214x/Kconfig index 5d52eb000..25b82bd6b 100644 --- a/nuttx/arch/arm/src/lpc214x/Kconfig +++ b/nuttx/arch/arm/src/lpc214x/Kconfig @@ -117,7 +117,7 @@ config LPC214X_USBDEV_DMA bool "USB Device DMA Support" default n -config CONFIG_LPC214X_USBDEV_NDMADESCRIPTORS +config LPC214X_USBDEV_NDMADESCRIPTORS int "Number of USB DMA Descriptors" default 8 depends on LPC214X_USBDEV_DMA diff --git a/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c b/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c index c647e458a..f27eea977 100644 --- a/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c +++ b/nuttx/arch/arm/src/lpc214x/lpc214x_serial.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/lpc214x/lpc214x_serial.c * - * Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -569,6 +569,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) switch (cmd) { +#ifdef CONFIG_SERIAL_TIOCSERGSTRUCT case TIOCSERGSTRUCT: { struct up_dev_s *user = (struct up_dev_s*)arg; @@ -582,6 +583,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) } } break; +#endif case TIOCSBRK: /* BSD compatibility: Turn break on, unconditionally */ { |