* [PATCH v2 2/7] dgnc: clean up digi.h
2015-03-13 13:56 [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
@ 2015-03-13 13:56 ` Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 3/7] dgnc: get rid of dpacompat.h, move remaining stuff to digi.h Giedrius Statkevičius
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Giedrius Statkevičius @ 2015-03-13 13:56 UTC (permalink / raw)
To: lidza.louina, markh
Cc: gregkh, driverdev-devel, devel, linux-kernel,
Giedrius Statkevičius
Remove a lot of unused structs and defines from digi.h. We still have to
be careful with TIOCM_LE and TIOCMSET/TIOCMBIC because termios.h and
ioctls.h respectfully redefine them.
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
---
v2: Updated commit msg and remove some more unused stuff
drivers/staging/dgnc/digi.h | 267 --------------------------------------------
1 file changed, 267 deletions(-)
diff --git a/drivers/staging/dgnc/digi.h b/drivers/staging/dgnc/digi.h
index 554fbeb..2f0b4a9 100644
--- a/drivers/staging/dgnc/digi.h
+++ b/drivers/staging/dgnc/digi.h
@@ -16,25 +16,6 @@
#ifndef __DIGI_H
#define __DIGI_H
-/************************************************************************
- *** Definitions for Digi ditty(1) command.
- ************************************************************************/
-
-
-/*
- * Copyright (c) 1988-96 Digi International Inc., All Rights Reserved.
- */
-
-/************************************************************************
- * This module provides application access to special Digi
- * serial line enhancements which are not standard UNIX(tm) features.
- ************************************************************************/
-
-#if !defined(TIOCMODG)
-
-#define TIOCMODG (('d'<<8) | 250) /* get modem ctrl state */
-#define TIOCMODS (('d'<<8) | 251) /* set modem ctrl state */
-
#ifndef TIOCM_LE
#define TIOCM_LE 0x01 /* line enable */
#define TIOCM_DTR 0x02 /* data terminal ready */
@@ -49,8 +30,6 @@
#define TIOCM_CD TIOCM_CAR /* carrier detect (alt) */
#endif
-#endif
-
#if !defined(TIOCMSET)
#define TIOCMSET (('d'<<8) | 252) /* set modem ctrl state */
#define TIOCMGET (('d'<<8) | 253) /* set modem ctrl state */
@@ -61,83 +40,19 @@
#define TIOCMBIS (('d'<<8) | 255) /* set modem ctrl state */
#endif
-
-#if !defined(TIOCSDTR)
-#define TIOCSDTR (('e'<<8) | 0) /* set DTR */
-#define TIOCCDTR (('e'<<8) | 1) /* clear DTR */
-#endif
-
-/************************************************************************
- * Ioctl command arguments for DIGI parameters.
- ************************************************************************/
#define DIGI_GETA (('e'<<8) | 94) /* Read params */
-
#define DIGI_SETA (('e'<<8) | 95) /* Set params */
#define DIGI_SETAW (('e'<<8) | 96) /* Drain & set params */
#define DIGI_SETAF (('e'<<8) | 97) /* Drain, flush & set params */
-
-#define DIGI_KME (('e'<<8) | 98) /* Read/Write Host */
- /* Adapter Memory */
-
-#define DIGI_GETFLOW (('e'<<8) | 99) /* Get startc/stopc flow */
- /* control characters */
-#define DIGI_SETFLOW (('e'<<8) | 100) /* Set startc/stopc flow */
- /* control characters */
-#define DIGI_GETAFLOW (('e'<<8) | 101) /* Get Aux. startc/stopc */
- /* flow control chars */
-#define DIGI_SETAFLOW (('e'<<8) | 102) /* Set Aux. startc/stopc */
- /* flow control chars */
-
-#define DIGI_GEDELAY (('d'<<8) | 246) /* Get edelay */
-#define DIGI_SEDELAY (('d'<<8) | 247) /* Set edelay */
-
-struct digiflow_t {
- unsigned char startc; /* flow cntl start char */
- unsigned char stopc; /* flow cntl stop char */
-};
-
-
-#ifdef FLOW_2200
-#define F2200_GETA (('e'<<8) | 104) /* Get 2x36 flow cntl flags */
-#define F2200_SETAW (('e'<<8) | 105) /* Set 2x36 flow cntl flags */
-#define F2200_MASK 0x03 /* 2200 flow cntl bit mask */
-#define FCNTL_2200 0x01 /* 2x36 terminal flow cntl */
-#define PCNTL_2200 0x02 /* 2x36 printer flow cntl */
-#define F2200_XON 0xf8
-#define P2200_XON 0xf9
-#define F2200_XOFF 0xfa
-#define P2200_XOFF 0xfb
-
-#define FXOFF_MASK 0x03 /* 2200 flow status mask */
-#define RCVD_FXOFF 0x01 /* 2x36 Terminal XOFF rcvd */
-#define RCVD_PXOFF 0x02 /* 2x36 Printer XOFF rcvd */
-#endif
-
-/************************************************************************
- * Values for digi_flags
- ************************************************************************/
-#define DIGI_IXON 0x0001 /* Handle IXON in the FEP */
#define DIGI_FAST 0x0002 /* Fast baud rates */
#define RTSPACE 0x0004 /* RTS input flow control */
#define CTSPACE 0x0008 /* CTS output flow control */
-#define DSRPACE 0x0010 /* DSR output flow control */
-#define DCDPACE 0x0020 /* DCD output flow control */
-#define DTRPACE 0x0040 /* DTR input flow control */
#define DIGI_COOK 0x0080 /* Cooked processing done in FEP */
#define DIGI_FORCEDCD 0x0100 /* Force carrier */
#define DIGI_ALTPIN 0x0200 /* Alternate RJ-45 pin config */
-#define DIGI_AIXON 0x0400 /* Aux flow control in fep */
#define DIGI_PRINTER 0x0800 /* Hold port open for flow cntrl*/
-#define DIGI_PP_INPUT 0x1000 /* Change parallel port to input*/
#define DIGI_DTR_TOGGLE 0x2000 /* Support DTR Toggle */
-#define DIGI_422 0x4000 /* for 422/232 selectable panel */
#define DIGI_RTS_TOGGLE 0x8000 /* Support RTS Toggle */
-
-/************************************************************************
- * These options are not supported on the comxi.
- ************************************************************************/
-#define DIGI_COMXI (DIGI_FAST|DIGI_COOK|DSRPACE|DCDPACE|DTRPACE)
-
#define DIGI_PLEN 28 /* String length */
#define DIGI_TSIZ 10 /* Terminal string len */
@@ -157,76 +72,6 @@ struct digi_t {
};
/************************************************************************
- * KME definitions and structures.
- ************************************************************************/
-#define RW_IDLE 0 /* Operation complete */
-#define RW_READ 1 /* Read Concentrator Memory */
-#define RW_WRITE 2 /* Write Concentrator Memory */
-
-struct rw_t {
- unsigned char rw_req; /* Request type */
- unsigned char rw_board; /* Host Adapter board number */
- unsigned char rw_conc; /* Concentrator number */
- unsigned char rw_reserved; /* Reserved for expansion */
- unsigned int rw_addr; /* Address in concentrator */
- unsigned short rw_size; /* Read/write request length */
- unsigned char rw_data[128]; /* Data to read/write */
-};
-
-/***********************************************************************
- * Shrink Buffer and Board Information definitions and structures.
-
- ************************************************************************/
- /* Board type return codes */
-#define PCXI_TYPE 1 /* Board type at the designated port is a PC/Xi */
-#define PCXM_TYPE 2 /* Board type at the designated port is a PC/Xm */
-#define PCXE_TYPE 3 /* Board type at the designated port is a PC/Xe */
-#define MCXI_TYPE 4 /* Board type at the designated port is a MC/Xi */
-#define COMXI_TYPE 5 /* Board type at the designated port is a COM/Xi */
-
- /* Non-Zero Result codes. */
-#define RESULT_NOBDFND 1 /* A Digi product at that port is not config installed */
-#define RESULT_NODESCT 2 /* A memory descriptor was not obtainable */
-#define RESULT_NOOSSIG 3 /* FEP/OS signature was not detected on the board */
-#define RESULT_TOOSML 4 /* Too small an area to shrink. */
-#define RESULT_NOCHAN 5 /* Channel structure for the board was not found */
-
-struct shrink_buf_struct {
- unsigned int shrink_buf_vaddr; /* Virtual address of board */
- unsigned int shrink_buf_phys; /* Physical address of board */
- unsigned int shrink_buf_bseg; /* Amount of board memory */
- unsigned int shrink_buf_hseg; /* '186 Beginning of Dual-Port */
-
- unsigned int shrink_buf_lseg; /* '186 Beginning of freed memory */
- unsigned int shrink_buf_mseg; /* Linear address from start of
- dual-port were freed memory
- begins, host viewpoint. */
-
- unsigned int shrink_buf_bdparam; /* Parameter for xxmemon and
- xxmemoff */
-
- unsigned int shrink_buf_reserva; /* Reserved */
- unsigned int shrink_buf_reservb; /* Reserved */
- unsigned int shrink_buf_reservc; /* Reserved */
- unsigned int shrink_buf_reservd; /* Reserved */
-
- unsigned char shrink_buf_result; /* Reason for call failing
- Zero is Good return */
- unsigned char shrink_buf_init; /* Non-Zero if it caused an
- xxinit call. */
-
- unsigned char shrink_buf_anports; /* Number of async ports */
- unsigned char shrink_buf_snports; /* Number of sync ports */
- unsigned char shrink_buf_type; /* Board type 1 = PC/Xi,
- 2 = PC/Xm,
- 3 = PC/Xe
- 4 = MC/Xi
- 5 = COMX/i */
- unsigned char shrink_buf_card; /* Card number */
-
-};
-
-/************************************************************************
* Structure to get driver status information
************************************************************************/
struct digi_dinfo {
@@ -257,52 +102,6 @@ struct digi_info {
#define DIGI_GETBD (('d'<<8) | 249) /* get board info */
-struct digi_stat {
- unsigned int info_chan; /* Channel number (0 based) */
- unsigned int info_brd; /* Board number (0 based) */
- unsigned int info_cflag; /* cflag for channel */
- unsigned int info_iflag; /* iflag for channel */
- unsigned int info_oflag; /* oflag for channel */
- unsigned int info_mstat; /* mstat for channel */
- unsigned int info_tx_data; /* tx_data for channel */
- unsigned int info_rx_data; /* rx_data for channel */
- unsigned int info_hflow; /* hflow for channel */
- unsigned int info_reserved[8]; /* for future expansion */
-};
-
-#define DIGI_GETSTAT (('d'<<8) | 244) /* get board info */
-/************************************************************************
- *
- * Structure used with ioctl commands for per-channel information
- *
- ************************************************************************/
-struct digi_ch {
- unsigned int info_bdnum; /* Board number (0 based) */
- unsigned int info_channel; /* Channel index number */
- unsigned int info_ch_cflag; /* Channel cflag */
- unsigned int info_ch_iflag; /* Channel iflag */
- unsigned int info_ch_oflag; /* Channel oflag */
- unsigned int info_chsize; /* Channel structure size */
- unsigned int info_sleep_stat; /* sleep status */
- dev_t info_dev; /* device number */
- unsigned char info_initstate; /* Channel init state */
- unsigned char info_running; /* Channel running state */
- int reserved[8]; /* reserved for future use */
-};
-
-/*
-* This structure is used with the DIGI_FEPCMD ioctl to
-* tell the driver which port to send the command for.
-*/
-struct digi_cmd {
- int cmd;
- int word;
- int ncmds;
- int chan; /* channel index (zero based) */
- int bdid; /* board index (zero based) */
-};
-
-
struct digi_getbuffer /* Struct for holding buffer use counts */
{
unsigned long tIn;
@@ -322,63 +121,9 @@ struct digi_getcounter {
unsigned long tbytes; /* number of bytes transmitted fully */
};
-/*
-* info_sleep_stat defines
-*/
-#define INFO_RUNWAIT 0x0001
-#define INFO_WOPEN 0x0002
-#define INFO_TTIOW 0x0004
-#define INFO_CH_RWAIT 0x0008
-#define INFO_CH_WEMPTY 0x0010
-#define INFO_CH_WLOW 0x0020
-#define INFO_XXBUF_BUSY 0x0040
-
-#define DIGI_GETCH (('d'<<8) | 245) /* get board info */
-
-/* Board type definitions */
-
-#define SUBTYPE 0007
-#define T_PCXI 0000
-#define T_PCXM 0001
-#define T_PCXE 0002
-#define T_PCXR 0003
-#define T_SP 0004
-#define T_SP_PLUS 0005
-# define T_HERC 0000
-# define T_HOU 0001
-# define T_LON 0002
-# define T_CHA 0003
-#define FAMILY 0070
-#define T_COMXI 0000
-#define T_PCXX 0010
-#define T_CX 0020
-#define T_EPC 0030
-#define T_PCLITE 0040
-#define T_SPXX 0050
-#define T_AVXX 0060
-#define T_DXB 0070
-#define T_A2K_4_8 0070
-#define BUSTYPE 0700
-#define T_ISABUS 0000
-#define T_MCBUS 0100
-#define T_EISABUS 0200
-#define T_PCIBUS 0400
-
/* Board State Definitions */
-
#define BD_RUNNING 0x0
-#define BD_REASON 0x7f
-#define BD_NOTFOUND 0x1
-#define BD_NOIOPORT 0x2
-#define BD_NOMEM 0x3
-#define BD_NOBIOS 0x4
#define BD_NOFEP 0x5
-#define BD_FAILED 0x6
-#define BD_ALLOCATED 0x7
-#define BD_TRIBOOT 0x8
-#define BD_BADKME 0x80
-
-#define DIGI_SPOLL (('d'<<8) | 254) /* change poller rate */
#define DIGI_SETCUSTOMBAUD _IOW('e', 106, int) /* Set integer baud rate */
#define DIGI_GETCUSTOMBAUD _IOR('e', 107, int) /* Get integer baud rate */
@@ -390,20 +135,8 @@ struct digi_getcounter {
#define EV_OPU 0x0001 /* !<Output paused by client */
#define EV_OPS 0x0002 /* !<Output paused by reqular sw flowctrl */
-#define EV_OPX 0x0004 /* !<Output paused by extra sw flowctrl */
-#define EV_OPH 0x0008 /* !<Output paused by hw flowctrl */
-#define EV_OPT 0x0800 /* !<Output paused for RTS Toggle predelay */
-
#define EV_IPU 0x0010 /* !<Input paused unconditionally by user */
#define EV_IPS 0x0020 /* !<Input paused by high/low water marks */
-#define EV_IPA 0x0400 /* !<Input paused by pattern alarm module */
-
#define EV_TXB 0x0040 /* !<Transmit break pending */
-#define EV_TXI 0x0080 /* !<Transmit immediate pending */
-#define EV_TXF 0x0100 /* !<Transmit flowctrl char pending */
-#define EV_RXB 0x0200 /* !<Break received */
-
-#define EV_OPALL 0x080f /* !<Output pause flags */
-#define EV_IPALL 0x0430 /* !<Input pause flags */
#endif /* DIGI_H */
--
2.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 3/7] dgnc: get rid of dpacompat.h, move remaining stuff to digi.h
2015-03-13 13:56 [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 2/7] dgnc: clean up digi.h Giedrius Statkevičius
@ 2015-03-13 13:56 ` Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 4/7] dgnc: use linux/types.h instead of dgnc_types.h Giedrius Statkevičius
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Giedrius Statkevičius @ 2015-03-13 13:56 UTC (permalink / raw)
To: lidza.louina, markh
Cc: gregkh, driverdev-devel, devel, linux-kernel,
Giedrius Statkevičius
Dpacompat.h contained a lot of unused #defines and only few things are
used from it so since we've trimmed down digi.h, now we can delete
dpacompat.h and move remaining stuff into digi.h.
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
---
v2: No change
drivers/staging/dgnc/dgnc_driver.c | 1 -
drivers/staging/dgnc/dgnc_mgmt.c | 1 -
drivers/staging/dgnc/dgnc_tty.c | 1 -
drivers/staging/dgnc/digi.h | 36 ++++++++++++
drivers/staging/dgnc/dpacompat.h | 109 -------------------------------------
5 files changed, 36 insertions(+), 112 deletions(-)
delete mode 100644 drivers/staging/dgnc/dpacompat.h
diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c
index 9ae9014..805dc61 100644
--- a/drivers/staging/dgnc/dgnc_driver.c
+++ b/drivers/staging/dgnc/dgnc_driver.c
@@ -21,7 +21,6 @@
#include <linux/sched.h>
#include "dgnc_driver.h"
#include "dgnc_pci.h"
-#include "dpacompat.h"
#include "dgnc_mgmt.h"
#include "dgnc_tty.h"
#include "dgnc_cls.h"
diff --git a/drivers/staging/dgnc/dgnc_mgmt.c b/drivers/staging/dgnc/dgnc_mgmt.c
index 5781406..1a00eac 100644
--- a/drivers/staging/dgnc/dgnc_mgmt.c
+++ b/drivers/staging/dgnc/dgnc_mgmt.c
@@ -32,7 +32,6 @@
#include "dgnc_pci.h"
#include "dgnc_kcompat.h" /* Kernel 2.4/2.6 compat includes */
#include "dgnc_mgmt.h"
-#include "dpacompat.h"
/* Our "in use" variables, to enforce 1 open only */
diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c
index 8445f84..1085d4c 100644
--- a/drivers/staging/dgnc/dgnc_tty.c
+++ b/drivers/staging/dgnc/dgnc_tty.c
@@ -39,7 +39,6 @@
#include "dgnc_types.h"
#include "dgnc_neo.h"
#include "dgnc_cls.h"
-#include "dpacompat.h"
#include "dgnc_sysfs.h"
#include "dgnc_utils.h"
diff --git a/drivers/staging/dgnc/digi.h b/drivers/staging/dgnc/digi.h
index 2f0b4a9..281b975 100644
--- a/drivers/staging/dgnc/digi.h
+++ b/drivers/staging/dgnc/digi.h
@@ -44,6 +44,11 @@
#define DIGI_SETA (('e'<<8) | 95) /* Set params */
#define DIGI_SETAW (('e'<<8) | 96) /* Drain & set params */
#define DIGI_SETAF (('e'<<8) | 97) /* Drain, flush & set params */
+#define DIGI_GET_NI_INFO (('d'<<8) | 250) /* Non-intelligent state info */
+#define DIGI_LOOPBACK (('d'<<8) | 252) /*
+ * Enable/disable UART
+ * internal loopback
+ */
#define DIGI_FAST 0x0002 /* Fast baud rates */
#define RTSPACE 0x0004 /* RTS input flow control */
#define CTSPACE 0x0008 /* CTS output flow control */
@@ -139,4 +144,35 @@ struct digi_getcounter {
#define EV_IPS 0x0020 /* !<Input paused by high/low water marks */
#define EV_TXB 0x0040 /* !<Transmit break pending */
+/*
+ * This structure holds data needed for the intelligent <--> nonintelligent
+ * DPA translation
+ */
+struct ni_info {
+ int board;
+ int channel;
+ int dtr;
+ int rts;
+ int cts;
+ int dsr;
+ int ri;
+ int dcd;
+ int curtx;
+ int currx;
+ unsigned short iflag;
+ unsigned short oflag;
+ unsigned short cflag;
+ unsigned short lflag;
+ unsigned int mstat;
+ unsigned char hflow;
+ unsigned char xmit_stopped;
+ unsigned char recv_stopped;
+ unsigned int baud;
+};
+
+#define T_CLASSIC 0002
+#define T_PCIBUS 0400
+#define T_NEO_EXPRESS 0001
+#define T_NEO 0000
+
#endif /* DIGI_H */
diff --git a/drivers/staging/dgnc/dpacompat.h b/drivers/staging/dgnc/dpacompat.h
deleted file mode 100644
index f41a0e1..0000000
--- a/drivers/staging/dgnc/dpacompat.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2003 Digi International (www.digi.com)
- * Scott H Kilau <Scott_Kilau at digi dot com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- */
-
-
-/*
- * This structure holds data needed for the intelligent <--> nonintelligent
- * DPA translation
- */
-struct ni_info {
- int board;
- int channel;
- int dtr;
- int rts;
- int cts;
- int dsr;
- int ri;
- int dcd;
- int curtx;
- int currx;
- unsigned short iflag;
- unsigned short oflag;
- unsigned short cflag;
- unsigned short lflag;
-
- unsigned int mstat;
- unsigned char hflow;
-
- unsigned char xmit_stopped;
- unsigned char recv_stopped;
-
- unsigned int baud;
-};
-
-#define RW_READ 1
-#define RW_WRITE 2
-#define DIGI_KME (('e'<<8) | 98) /* Read/Write Host */
-
-#define SUBTYPE 0007
-#define T_PCXI 0000
-#define T_PCXEM 0001
-#define T_PCXE 0002
-#define T_PCXR 0003
-#define T_SP 0004
-#define T_SP_PLUS 0005
-
-#define T_HERC 0000
-#define T_HOU 0001
-#define T_LON 0002
-#define T_CHA 0003
-
-#define T_NEO 0000
-#define T_NEO_EXPRESS 0001
-#define T_CLASSIC 0002
-
-#define FAMILY 0070
-#define T_COMXI 0000
-#define T_NI 0000
-#define T_PCXX 0010
-#define T_CX 0020
-#define T_EPC 0030
-#define T_PCLITE 0040
-#define T_SPXX 0050
-#define T_AVXX 0060
-#define T_DXB 0070
-#define T_A2K_4_8 0070
-
-#define BUSTYPE 0700
-#define T_ISABUS 0000
-#define T_MCBUS 0100
-#define T_EISABUS 0200
-#define T_PCIBUS 0400
-
-/* Board State Definitions */
-
-#define BD_RUNNING 0x0
-#define BD_REASON 0x7f
-#define BD_NOTFOUND 0x1
-#define BD_NOIOPORT 0x2
-#define BD_NOMEM 0x3
-#define BD_NOBIOS 0x4
-#define BD_NOFEP 0x5
-#define BD_FAILED 0x6
-#define BD_ALLOCATED 0x7
-#define BD_TRIBOOT 0x8
-#define BD_BADKME 0x80
-
-#define DIGI_AIXON 0x0400 /* Aux flow control in fep */
-
-/* Ioctls needed for dpa operation */
-
-#define DIGI_GETDD (('d'<<8) | 248) /* get driver info */
-#define DIGI_GETBD (('d'<<8) | 249) /* get board info */
-#define DIGI_GET_NI_INFO (('d'<<8) | 250) /* nonintelligent state snfo */
-
-/* Other special ioctls */
-#define DIGI_TIMERIRQ (('d'<<8) | 251) /* Enable/disable RS_TIMER use */
-#define DIGI_LOOPBACK (('d'<<8) | 252) /* Enable/disable UART internal loopback */
--
2.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 4/7] dgnc: use linux/types.h instead of dgnc_types.h
2015-03-13 13:56 [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 2/7] dgnc: clean up digi.h Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 3/7] dgnc: get rid of dpacompat.h, move remaining stuff to digi.h Giedrius Statkevičius
@ 2015-03-13 13:56 ` Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 5/7] dgnc: remove old 2.4-2.6 compat kernel defines Giedrius Statkevičius
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Giedrius Statkevičius @ 2015-03-13 13:56 UTC (permalink / raw)
To: lidza.louina, markh
Cc: gregkh, driverdev-devel, devel, linux-kernel,
Giedrius Statkevičius
Dgnc_types.h unnecesarily defines TRUE as 1 and FALSE as 0 because we
already have a widely used linux/types.h so convert all TRUE to true,
FALSE to false and edit the dgnc_board struct to make sure it uses
"bool".
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
---
I'm still not sure whether it's safe to call tty_unregister_driver() and
tty_unregister_device() in dgnc_tty_uninit() if the driver/device is not
registered successfully so let it be like this for now.
v2: Use linux/types.h instead of removing TRUE/FALSE defines and
replacing them with 1/0. Also, change the relevant type in dgnc_board
struct to bool. Dgnc_types.h still gets removed.
drivers/staging/dgnc/dgnc_cls.h | 3 ---
drivers/staging/dgnc/dgnc_driver.h | 5 ++---
drivers/staging/dgnc/dgnc_neo.h | 1 -
drivers/staging/dgnc/dgnc_tty.c | 10 +++++-----
drivers/staging/dgnc/dgnc_types.h | 27 ---------------------------
5 files changed, 7 insertions(+), 39 deletions(-)
delete mode 100644 drivers/staging/dgnc/dgnc_types.h
diff --git a/drivers/staging/dgnc/dgnc_cls.h b/drivers/staging/dgnc/dgnc_cls.h
index 2398514..85042bd 100644
--- a/drivers/staging/dgnc/dgnc_cls.h
+++ b/drivers/staging/dgnc/dgnc_cls.h
@@ -16,9 +16,6 @@
#ifndef __DGNC_CLS_H
#define __DGNC_CLS_H
-#include "dgnc_types.h"
-
-
/************************************************************************
* Per channel/port Classic UART structure *
************************************************************************
diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h
index 15c4d95..2bde3b2 100644
--- a/drivers/staging/dgnc/dgnc_driver.h
+++ b/drivers/staging/dgnc/dgnc_driver.h
@@ -25,7 +25,6 @@
#include <linux/tty.h> /* To pick up the various tty structs/defines */
#include <linux/interrupt.h> /* For irqreturn_t type */
-#include "dgnc_types.h" /* Additional types needed by the Digi header files */
#include "digi.h" /* Digi specific ioctl header */
#include "dgnc_kcompat.h" /* Kernel 2.4/2.6 compat includes */
#include "dgnc_sysfs.h" /* Support for SYSFS */
@@ -206,8 +205,8 @@ struct dgnc_board {
struct tty_driver PrintDriver;
char PrintName[200];
- uint dgnc_Major_Serial_Registered;
- uint dgnc_Major_TransparentPrint_Registered;
+ bool dgnc_Major_Serial_Registered;
+ bool dgnc_Major_TransparentPrint_Registered;
uint dgnc_Serial_Major;
uint dgnc_TransparentPrint_Major;
diff --git a/drivers/staging/dgnc/dgnc_neo.h b/drivers/staging/dgnc/dgnc_neo.h
index d7e764a..c528df5 100644
--- a/drivers/staging/dgnc/dgnc_neo.h
+++ b/drivers/staging/dgnc/dgnc_neo.h
@@ -16,7 +16,6 @@
#ifndef __DGNC_NEO_H
#define __DGNC_NEO_H
-#include "dgnc_types.h"
#include "dgnc_driver.h"
/************************************************************************
diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c
index 1085d4c..886b2b2 100644
--- a/drivers/staging/dgnc/dgnc_tty.c
+++ b/drivers/staging/dgnc/dgnc_tty.c
@@ -29,6 +29,7 @@
#include <linux/ctype.h>
#include <linux/tty.h>
#include <linux/tty_flip.h>
+#include <linux/types.h>
#include <linux/serial_reg.h>
#include <linux/slab.h>
#include <linux/delay.h> /* For udelay */
@@ -36,7 +37,6 @@
#include <linux/pci.h>
#include "dgnc_driver.h"
#include "dgnc_tty.h"
-#include "dgnc_types.h"
#include "dgnc_neo.h"
#include "dgnc_cls.h"
#include "dgnc_sysfs.h"
@@ -220,7 +220,7 @@ int dgnc_tty_register(struct dgnc_board *brd)
"Can't register tty device (%d)\n", rc);
return rc;
}
- brd->dgnc_Major_Serial_Registered = TRUE;
+ brd->dgnc_Major_Serial_Registered = true;
}
/*
@@ -270,7 +270,7 @@ int dgnc_tty_register(struct dgnc_board *brd)
rc);
return rc;
}
- brd->dgnc_Major_TransparentPrint_Registered = TRUE;
+ brd->dgnc_Major_TransparentPrint_Registered = true;
}
dgnc_BoardsByMajor[brd->SerialDriver.major] = brd;
@@ -408,7 +408,7 @@ void dgnc_tty_uninit(struct dgnc_board *brd)
tty_unregister_device(&brd->SerialDriver, i);
}
tty_unregister_driver(&brd->SerialDriver);
- brd->dgnc_Major_Serial_Registered = FALSE;
+ brd->dgnc_Major_Serial_Registered = false;
}
if (brd->dgnc_Major_TransparentPrint_Registered) {
@@ -419,7 +419,7 @@ void dgnc_tty_uninit(struct dgnc_board *brd)
tty_unregister_device(&brd->PrintDriver, i);
}
tty_unregister_driver(&brd->PrintDriver);
- brd->dgnc_Major_TransparentPrint_Registered = FALSE;
+ brd->dgnc_Major_TransparentPrint_Registered = false;
}
kfree(brd->SerialDriver.ttys);
diff --git a/drivers/staging/dgnc/dgnc_types.h b/drivers/staging/dgnc/dgnc_types.h
deleted file mode 100644
index 2853d16..0000000
--- a/drivers/staging/dgnc/dgnc_types.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2003 Digi International (www.digi.com)
- * Scott H Kilau <Scott_Kilau at digi dot com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- */
-
-#ifndef __DGNC_TYPES_H
-#define __DGNC_TYPES_H
-
-#ifndef TRUE
-# define TRUE 1
-#endif
-
-#ifndef FALSE
-# define FALSE 0
-#endif
-
-#endif
--
2.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 5/7] dgnc: remove old 2.4-2.6 compat kernel defines
2015-03-13 13:56 [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
` (2 preceding siblings ...)
2015-03-13 13:56 ` [PATCH v2 4/7] dgnc: use linux/types.h instead of dgnc_types.h Giedrius Statkevičius
@ 2015-03-13 13:56 ` Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 6/7] dgnc: remove unused stuff from dgnc_cls.h Giedrius Statkevičius
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Giedrius Statkevičius @ 2015-03-13 13:56 UTC (permalink / raw)
To: lidza.louina, markh
Cc: gregkh, driverdev-devel, devel, linux-kernel,
Giedrius Statkevičius
dgnc_kcompat.h contains some old legacy defines in case the kernel
doesn't have __user defined but for current kernel versions these
defines don't make sense and are useless so remove them. Move the
TTY_FLIPBUF_SIZE define to digi.h because it's used in the code.
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
---
v2: No change
drivers/staging/dgnc/dgnc_driver.h | 1 -
drivers/staging/dgnc/dgnc_kcompat.h | 40 -------------------------------------
drivers/staging/dgnc/dgnc_mgmt.c | 1 -
drivers/staging/dgnc/digi.h | 1 +
4 files changed, 1 insertion(+), 42 deletions(-)
delete mode 100644 drivers/staging/dgnc/dgnc_kcompat.h
diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h
index 2bde3b2..f77fed5 100644
--- a/drivers/staging/dgnc/dgnc_driver.h
+++ b/drivers/staging/dgnc/dgnc_driver.h
@@ -26,7 +26,6 @@
#include <linux/interrupt.h> /* For irqreturn_t type */
#include "digi.h" /* Digi specific ioctl header */
-#include "dgnc_kcompat.h" /* Kernel 2.4/2.6 compat includes */
#include "dgnc_sysfs.h" /* Support for SYSFS */
/*************************************************************************
diff --git a/drivers/staging/dgnc/dgnc_kcompat.h b/drivers/staging/dgnc/dgnc_kcompat.h
deleted file mode 100644
index 2206038..0000000
--- a/drivers/staging/dgnc/dgnc_kcompat.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2004 Digi International (www.digi.com)
- * Scott H Kilau <Scott_Kilau at digi dot com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- *************************************************************************
- *
- * This file is intended to contain all the kernel "differences" between the
- * various kernels that we support.
- *
- *************************************************************************/
-
-#ifndef __DGNC_KCOMPAT_H
-#define __DGNC_KCOMPAT_H
-
-#if !defined(TTY_FLIPBUF_SIZE)
-# define TTY_FLIPBUF_SIZE 512
-#endif
-
-
-/* Sparse stuff */
-# ifndef __user
-# define __user
-# define __kernel
-# define __safe
-# define __force
-# define __chk_user_ptr(x) (void)0
-# endif
-
-
-#endif /* ! __DGNC_KCOMPAT_H */
diff --git a/drivers/staging/dgnc/dgnc_mgmt.c b/drivers/staging/dgnc/dgnc_mgmt.c
index 1a00eac..d0e22c1 100644
--- a/drivers/staging/dgnc/dgnc_mgmt.c
+++ b/drivers/staging/dgnc/dgnc_mgmt.c
@@ -30,7 +30,6 @@
#include "dgnc_driver.h"
#include "dgnc_pci.h"
-#include "dgnc_kcompat.h" /* Kernel 2.4/2.6 compat includes */
#include "dgnc_mgmt.h"
diff --git a/drivers/staging/dgnc/digi.h b/drivers/staging/dgnc/digi.h
index 281b975..d637a78 100644
--- a/drivers/staging/dgnc/digi.h
+++ b/drivers/staging/dgnc/digi.h
@@ -175,4 +175,5 @@ struct ni_info {
#define T_NEO_EXPRESS 0001
#define T_NEO 0000
+#define TTY_FLIPBUF_SIZE 512
#endif /* DIGI_H */
--
2.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 6/7] dgnc: remove unused stuff from dgnc_cls.h
2015-03-13 13:56 [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
` (3 preceding siblings ...)
2015-03-13 13:56 ` [PATCH v2 5/7] dgnc: remove old 2.4-2.6 compat kernel defines Giedrius Statkevičius
@ 2015-03-13 13:56 ` Giedrius Statkevičius
2015-03-13 13:56 ` [PATCH v2 7/7] dgnc: Clean up dgnc_sysfs.h Giedrius Statkevičius
2015-03-17 14:35 ` [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
6 siblings, 0 replies; 9+ messages in thread
From: Giedrius Statkevičius @ 2015-03-13 13:56 UTC (permalink / raw)
To: lidza.louina, markh
Cc: gregkh, driverdev-devel, devel, linux-kernel,
Giedrius Statkevičius
Remove unused defines from dgnc_cls.h
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
---
v2: No change
drivers/staging/dgnc/dgnc_cls.h | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/drivers/staging/dgnc/dgnc_cls.h b/drivers/staging/dgnc/dgnc_cls.h
index 85042bd..2597e36 100644
--- a/drivers/staging/dgnc/dgnc_cls.h
+++ b/drivers/staging/dgnc/dgnc_cls.h
@@ -51,15 +51,9 @@ struct cls_uart_struct {
#define UART_EXAR654_ENHANCED_REGISTER_SET 0xBF
-#define UART_16654_FCR_TXTRIGGER_8 0x0
#define UART_16654_FCR_TXTRIGGER_16 0x10
-#define UART_16654_FCR_TXTRIGGER_32 0x20
-#define UART_16654_FCR_TXTRIGGER_56 0x30
-
-#define UART_16654_FCR_RXTRIGGER_8 0x0
#define UART_16654_FCR_RXTRIGGER_16 0x40
#define UART_16654_FCR_RXTRIGGER_56 0x80
-#define UART_16654_FCR_RXTRIGGER_60 0xC0
/* Received CTS/RTS change of state */
#define UART_IIR_CTSRTS 0x20
@@ -76,13 +70,6 @@ struct cls_uart_struct {
#define UART_EXAR654_EFR_IXOFF 0x8 /* Transmit Xon1/Xoff1 */
#define UART_EXAR654_EFR_RTSDTR 0x40 /* Auto RTS/DTR Flow Control Enable */
#define UART_EXAR654_EFR_CTSDSR 0x80 /* Auto CTS/DSR Flow COntrol Enable */
-
-/* Indicates whether chip saw an incoming XOFF char */
-#define UART_EXAR654_XOFF_DETECT 0x1
-
-/* Indicates whether chip saw an incoming XON char */
-#define UART_EXAR654_XON_DETECT 0x2
-
#define UART_EXAR654_IER_XOFF 0x20 /* Xoff Interrupt Enable */
#define UART_EXAR654_IER_RTSDTR 0x40 /* Output Interrupt Enable */
#define UART_EXAR654_IER_CTSDSR 0x80 /* Input Interrupt Enable */
--
2.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 7/7] dgnc: Clean up dgnc_sysfs.h
2015-03-13 13:56 [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
` (4 preceding siblings ...)
2015-03-13 13:56 ` [PATCH v2 6/7] dgnc: remove unused stuff from dgnc_cls.h Giedrius Statkevičius
@ 2015-03-13 13:56 ` Giedrius Statkevičius
2015-03-17 14:35 ` [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
6 siblings, 0 replies; 9+ messages in thread
From: Giedrius Statkevičius @ 2015-03-13 13:56 UTC (permalink / raw)
To: lidza.louina, markh
Cc: gregkh, driverdev-devel, devel, linux-kernel,
Giedrius Statkevičius
Remove redundant blank lines, move absolute include after relative
include.
Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
---
v2: no change
drivers/staging/dgnc/dgnc_sysfs.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/staging/dgnc/dgnc_sysfs.h b/drivers/staging/dgnc/dgnc_sysfs.h
index 2758914..be0f90a 100644
--- a/drivers/staging/dgnc/dgnc_sysfs.h
+++ b/drivers/staging/dgnc/dgnc_sysfs.h
@@ -16,9 +16,8 @@
#ifndef __DGNC_SYSFS_H
#define __DGNC_SYSFS_H
-#include "dgnc_driver.h"
-
#include <linux/device.h>
+#include "dgnc_driver.h"
struct dgnc_board;
struct channel_t;
@@ -38,6 +37,4 @@ extern int dgnc_tty_class_destroy(void);
extern void dgnc_create_tty_sysfs(struct un_t *un, struct device *c);
extern void dgnc_remove_tty_sysfs(struct device *c);
-
-
#endif
--
2.3.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command
2015-03-13 13:56 [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
` (5 preceding siblings ...)
2015-03-13 13:56 ` [PATCH v2 7/7] dgnc: Clean up dgnc_sysfs.h Giedrius Statkevičius
@ 2015-03-17 14:35 ` Giedrius Statkevičius
2015-03-17 14:48 ` Greg KH
6 siblings, 1 reply; 9+ messages in thread
From: Giedrius Statkevičius @ 2015-03-17 14:35 UTC (permalink / raw)
To: lidza.louina, markh; +Cc: gregkh, driverdev-devel, devel, linux-kernel
Greg, you probably missed these :) Could you look at these when you have
some time?
On 2015.03.13 15:56, Giedrius Statkevičius wrote:
> dgnc_ioctl_name() is never used anywhere so remove it
>
> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@gmail.com>
> ---
> v2: Forgot to include this patch in the first version. Without this some
> of the other patches in this set will fail.
>
> drivers/staging/dgnc/dgnc_utils.c | 52 ---------------------------------------
> drivers/staging/dgnc/dgnc_utils.h | 1 -
> 2 files changed, 53 deletions(-)
>
> diff --git a/drivers/staging/dgnc/dgnc_utils.c b/drivers/staging/dgnc/dgnc_utils.c
> index 80b5133..f76de82 100644
> --- a/drivers/staging/dgnc/dgnc_utils.c
> +++ b/drivers/staging/dgnc/dgnc_utils.c
> @@ -16,55 +16,3 @@ int dgnc_ms_sleep(ulong ms)
> schedule_timeout((ms * HZ) / 1000);
> return signal_pending(current);
> }
> -
> -/*
> - * dgnc_ioctl_name() : Returns a text version of each ioctl value.
> - */
> -char *dgnc_ioctl_name(int cmd)
> -{
> - switch (cmd) {
> -
> - case TCGETA: return "TCGETA";
> - case TCGETS: return "TCGETS";
> - case TCSETA: return "TCSETA";
> - case TCSETS: return "TCSETS";
> - case TCSETAW: return "TCSETAW";
> - case TCSETSW: return "TCSETSW";
> - case TCSETAF: return "TCSETAF";
> - case TCSETSF: return "TCSETSF";
> - case TCSBRK: return "TCSBRK";
> - case TCXONC: return "TCXONC";
> - case TCFLSH: return "TCFLSH";
> - case TIOCGSID: return "TIOCGSID";
> -
> - case TIOCGETD: return "TIOCGETD";
> - case TIOCSETD: return "TIOCSETD";
> - case TIOCGWINSZ: return "TIOCGWINSZ";
> - case TIOCSWINSZ: return "TIOCSWINSZ";
> -
> - case TIOCMGET: return "TIOCMGET";
> - case TIOCMSET: return "TIOCMSET";
> - case TIOCMBIS: return "TIOCMBIS";
> - case TIOCMBIC: return "TIOCMBIC";
> -
> - /* from digi.h */
> - case DIGI_SETA: return "DIGI_SETA";
> - case DIGI_SETAW: return "DIGI_SETAW";
> - case DIGI_SETAF: return "DIGI_SETAF";
> - case DIGI_SETFLOW: return "DIGI_SETFLOW";
> - case DIGI_SETAFLOW: return "DIGI_SETAFLOW";
> - case DIGI_GETFLOW: return "DIGI_GETFLOW";
> - case DIGI_GETAFLOW: return "DIGI_GETAFLOW";
> - case DIGI_GETA: return "DIGI_GETA";
> - case DIGI_GEDELAY: return "DIGI_GEDELAY";
> - case DIGI_SEDELAY: return "DIGI_SEDELAY";
> - case DIGI_GETCUSTOMBAUD: return "DIGI_GETCUSTOMBAUD";
> - case DIGI_SETCUSTOMBAUD: return "DIGI_SETCUSTOMBAUD";
> - case TIOCMODG: return "TIOCMODG";
> - case TIOCMODS: return "TIOCMODS";
> - case TIOCSDTR: return "TIOCSDTR";
> - case TIOCCDTR: return "TIOCCDTR";
> -
> - default: return "unknown";
> - }
> -}
> diff --git a/drivers/staging/dgnc/dgnc_utils.h b/drivers/staging/dgnc/dgnc_utils.h
> index cebf601..1164c3a 100644
> --- a/drivers/staging/dgnc/dgnc_utils.h
> +++ b/drivers/staging/dgnc/dgnc_utils.h
> @@ -2,6 +2,5 @@
> #define __DGNC_UTILS_H
>
> int dgnc_ms_sleep(ulong ms);
> -char *dgnc_ioctl_name(int cmd);
>
> #endif
>
--
Thanks,
Giedrius
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command
2015-03-17 14:35 ` [PATCH v2 1/7] dgnc: remove unused dgnc_ioctl_name() command Giedrius Statkevičius
@ 2015-03-17 14:48 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2015-03-17 14:48 UTC (permalink / raw)
To: Giedrius Statkevičius
Cc: lidza.louina, markh, driverdev-devel, devel, linux-kernel
On Tue, Mar 17, 2015 at 04:35:00PM +0200, Giedrius Statkevičius wrote:
> Greg, you probably missed these :) Could you look at these when you have
> some time?
>
> On 2015.03.13 15:56, Giedrius Statkevičius wrote:
4 days ago? Hah, I ignore patches for much longer normally :)
Also, these will sink to the bottom of my stack as you don't have
"staging" in the subject, so be aware of that.
Give a maintainer at _least_ a week before asking about a patch, we do
do other things than just review instantly every patch that comes in...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread