Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Sep 2020 21:59:11 +0000 (UTC)
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r365176 - head/sys/dev/ppbus
Message-ID:  <202009012159.081LxBLg048330@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mjg
Date: Tue Sep  1 21:59:11 2020
New Revision: 365176
URL: https://svnweb.freebsd.org/changeset/base/365176

Log:
  ppbus: clean up empty lines in .c and .h files

Modified:
  head/sys/dev/ppbus/if_plip.c
  head/sys/dev/ppbus/lpbb.c
  head/sys/dev/ppbus/lpt.c
  head/sys/dev/ppbus/pcfclock.c
  head/sys/dev/ppbus/ppb_1284.c
  head/sys/dev/ppbus/ppb_msq.c
  head/sys/dev/ppbus/ppb_msq.h
  head/sys/dev/ppbus/ppbconf.c
  head/sys/dev/ppbus/ppbconf.h
  head/sys/dev/ppbus/ppi.c
  head/sys/dev/ppbus/pps.c

Modified: head/sys/dev/ppbus/if_plip.c
==============================================================================
--- head/sys/dev/ppbus/if_plip.c	Tue Sep  1 21:58:56 2020	(r365175)
+++ head/sys/dev/ppbus/if_plip.c	Tue Sep  1 21:59:11 2020	(r365176)
@@ -539,7 +539,6 @@ lp_intr(void *arg)
 
 	ppb_assert_locked(ppbus);
 	if (sc->sc_ifp->if_flags & IFF_LINK0) {
-
 		/* Ack. the request */
 		ppb_wdtr(ppbus, 0x01);
 
@@ -599,7 +598,6 @@ lp_intr(void *arg)
 		len = sc->sc_ifp->if_mtu + LPIPHDRLEN;
 		bp  = sc->sc_ifbuf;
 		while (len--) {
-
 			cl = ppb_rstr(ppbus);
 			ppb_wdtr(ppbus, 8);
 
@@ -842,7 +840,6 @@ static device_method_t lp_methods[] = {
 	DEVMETHOD(device_probe,		lp_probe),
 	DEVMETHOD(device_attach,	lp_attach),
 	DEVMETHOD(device_detach,	lp_detach),
-
 	{ 0, 0 }
 };
 

Modified: head/sys/dev/ppbus/lpbb.c
==============================================================================
--- head/sys/dev/ppbus/lpbb.c	Tue Sep  1 21:58:56 2020	(r365175)
+++ head/sys/dev/ppbus/lpbb.c	Tue Sep  1 21:59:11 2020	(r365176)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/uio.h>
 
-
 #include <dev/ppbus/ppbconf.h>
 #include "ppbus_if.h"
 #include <dev/ppbus/ppbio.h>

Modified: head/sys/dev/ppbus/lpt.c
==============================================================================
--- head/sys/dev/ppbus/lpt.c	Tue Sep  1 21:58:56 2020	(r365175)
+++ head/sys/dev/ppbus/lpt.c	Tue Sep  1 21:59:11 2020	(r365176)
@@ -151,7 +151,6 @@ static void lptintr(void *arg);
 
 static devclass_t lpt_devclass;
 
-
 /* bits for state */
 #define	OPEN		(1<<0)	/* device is open */
 #define	ASLP		(1<<1)	/* awaiting draining of printer */
@@ -176,7 +175,6 @@ static devclass_t lpt_devclass;
 #define	MAX_SLEEP	(hz*5)	/* Timeout while waiting for device ready */
 #define	MAX_SPIN	20	/* Max delay for device ready in usecs */
 
-
 static	d_open_t	lptopen;
 static	d_close_t	lptclose;
 static	d_write_t	lptwrite;
@@ -708,7 +706,6 @@ lpt_pushbytes(struct lpt_data *sc)
 		/* strobe */
 		ppb_wctr(ppbus, sc->sc_control|LPC_STB);
 		ppb_wctr(ppbus, sc->sc_control);
-
 	}
 	return(0);
 }
@@ -990,7 +987,6 @@ static device_method_t lpt_methods[] = {
 	DEVMETHOD(device_probe,		lpt_probe),
 	DEVMETHOD(device_attach,	lpt_attach),
 	DEVMETHOD(device_detach,	lpt_detach),
-
 	{ 0, 0 }
 };
 

Modified: head/sys/dev/ppbus/pcfclock.c
==============================================================================
--- head/sys/dev/ppbus/pcfclock.c	Tue Sep  1 21:58:56 2020	(r365175)
+++ head/sys/dev/ppbus/pcfclock.c	Tue Sep  1 21:59:11 2020	(r365176)
@@ -325,7 +325,6 @@ static device_method_t pcfclock_methods[] = {
 	DEVMETHOD(device_identify,	pcfclock_identify),
 	DEVMETHOD(device_probe,		pcfclock_probe),
 	DEVMETHOD(device_attach,	pcfclock_attach),
-
 	{ 0, 0 }
 };
 

Modified: head/sys/dev/ppbus/ppb_1284.c
==============================================================================
--- head/sys/dev/ppbus/ppb_1284.c	Tue Sep  1 21:58:56 2020	(r365175)
+++ head/sys/dev/ppbus/ppb_1284.c	Tue Sep  1 21:59:11 2020	(r365176)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-
 #include <dev/ppbus/ppbconf.h>
 #include <dev/ppbus/ppb_1284.h>
 
@@ -224,7 +223,6 @@ ppb_peripheral_negociate(device_t bus, int mode, int o
 	/* nibble mode is not supported */
 	if ((r == (char)request_mode) ||
 			(r == NIBBLE_1284_NORMAL)) {
-
 		/* Event 5 - restore direction bit, no data avail */
 		ppb_wctr(bus, (STROBE | nINIT) & ~(SELECTIN));
 		DELAY(1);
@@ -489,7 +487,6 @@ nibble_1284_inbyte(device_t bus, char *buffer)
 	int i, error;
 
 	for (i = 0; i < 2; i++) {
-
 		/* Event 7 - ready to take data (nAUTO low) */
 		ppb_wctr(bus, (nINIT | AUTOFEED) & ~(STROBE | SELECTIN));
 
@@ -555,7 +552,6 @@ spp_1284_read(device_t bus, int mode, char *buffer, in
 	}
 
 	while ((len < max) && !(ppb_rstr(bus) & (nFAULT))) {
-
 		ppb_1284_set_state(bus, PPB_REVERSE_TRANSFER);
 
 #ifdef DEBUG_1284
@@ -744,11 +740,9 @@ ppb_1284_negociate(device_t bus, int mode, int options
 	/* Event 7 - quering result consider nACK not to misunderstand
 	 * a remote computer terminate sequence */
 	if (options & PPB_EXTENSIBILITY_LINK) {
-
 		/* XXX not fully supported yet */
 		ppb_1284_terminate(bus);
 		return (0);
-
 	}
 	if (request_mode == NIBBLE_1284_NORMAL) {
 		if (do_1284_wait(bus, nACK | SELECT, nACK)) {

Modified: head/sys/dev/ppbus/ppb_msq.c
==============================================================================
--- head/sys/dev/ppbus/ppb_msq.c	Tue Sep  1 21:58:56 2020	(r365175)
+++ head/sys/dev/ppbus/ppb_msq.c	Tue Sep  1 21:59:11 2020	(r365176)
@@ -343,4 +343,3 @@ ppb_MS_microseq(device_t bus, device_t dev, struct ppb
 error:
 	return (error);
 }
-

Modified: head/sys/dev/ppbus/ppb_msq.h
==============================================================================
--- head/sys/dev/ppbus/ppb_msq.h	Tue Sep  1 21:58:56 2020	(r365175)
+++ head/sys/dev/ppbus/ppb_msq.h	Tue Sep  1 21:59:11 2020	(r365176)
@@ -111,7 +111,6 @@
 #define MS_RSET(reg,assert,clear) { MS_OP_RSET, {{ (reg) }, { (assert) }, { (clear) }}}
 #define MS_RASSERT(reg,byte)	  { MS_OP_RASSERT, { { (reg) }, { (byte) }}}
 #define MS_RCLR(reg,clear)	  { MS_OP_RSET, {{ (reg) }, { MS_ASSERT_NONE }, { (clear) }}}
-
 #define MS_RFETCH(reg,mask,ptr) { MS_OP_RFETCH, {{ (reg) }, { (mask) }, { (ptr) }}}
 
 /* trigger the port with array[char, delay,...] */
@@ -127,7 +126,6 @@
 #define MS_DASS(byte) MS_RASSERT(MS_REG_DTR,byte)
 #define MS_SASS(byte) MS_RASSERT(MS_REG_STR,byte)
 #define MS_CASS(byte) MS_RASSERT(MS_REG_CTR,byte)
-
 #define MS_SET(accum)		{ MS_OP_SET, {{ (accum) }}}
 #define MS_BRSET(mask,offset)	{ MS_OP_BRSET, {{ (mask) }, { (offset) }}}
 #define MS_DBRA(offset)		{ MS_OP_DBRA, {{ (offset) }}}

Modified: head/sys/dev/ppbus/ppbconf.c
==============================================================================
--- head/sys/dev/ppbus/ppbconf.c	Tue Sep  1 21:58:56 2020	(r365175)
+++ head/sys/dev/ppbus/ppbconf.c	Tue Sep  1 21:59:11 2020	(r365176)
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 
 static MALLOC_DEFINE(M_PPBUSDEV, "ppbusdev", "Parallel Port bus device");
 
-
 static int	ppbus_intr(void *arg);
 
 /*
@@ -593,7 +592,6 @@ static device_method_t ppbus_methods[] = {
 	DEVMETHOD(bus_teardown_intr,	ppbus_teardown_intr),
 	DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
 	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
-
 	{ 0, 0 }
 };
 

Modified: head/sys/dev/ppbus/ppbconf.h
==============================================================================
--- head/sys/dev/ppbus/ppbconf.h	Tue Sep  1 21:58:56 2020	(r365175)
+++ head/sys/dev/ppbus/ppbconf.h	Tue Sep  1 21:59:11 2020	(r365176)
@@ -185,7 +185,6 @@ struct ppb_context {
 /* other fields are reserved to the ppbus internals */
 
 struct ppb_device {
-
 	const char *name;		/* name of the device */
 
 	u_int flags;			/* flags */
@@ -224,7 +223,6 @@ struct ppb_device {
  * Parallel Port Bus structure.
  */
 struct ppb_data {
-
 #define PPB_PnP_PRINTER	0
 #define PPB_PnP_MODEM	1
 #define PPB_PnP_NET	2

Modified: head/sys/dev/ppbus/ppi.c
==============================================================================
--- head/sys/dev/ppbus/ppi.c	Tue Sep  1 21:58:56 2020	(r365175)
+++ head/sys/dev/ppbus/ppi.c	Tue Sep  1 21:59:11 2020	(r365176)
@@ -241,7 +241,6 @@ ppiintr(void *arg)
 	ppi_disable_intr(ppidev);
 
 	switch (ppb_1284_get_state(ppbus)) {
-
 	/* accept IEEE1284 negotiation then wakeup a waiting process to
 	 * continue negotiation at process level */
 	case PPB_FORWARD_IDLE:
@@ -380,7 +379,6 @@ ppiread(struct cdev *dev, struct uio *uio, int ioflag)
 		 */
 		if ((ppb_1284_negociate(ppbus,
 			ppi->ppi_mode = PPB_NIBBLE, 0))) {
-
 			/* XXX Wait 2 seconds to let the remote host some
 			 * time to terminate its interrupt
 			 */
@@ -557,7 +555,6 @@ ppiioctl(struct cdev *dev, u_long cmd, caddr_t data, i
 
 	ppb_lock(ppbus);
 	switch (cmd) {
-
 	case PPIGDATA:			/* get data register */
 		*val = ppb_rdtr(ppbus);
 		break;
@@ -615,7 +612,6 @@ static device_method_t ppi_methods[] = {
 	DEVMETHOD(device_probe,		ppi_probe),
 	DEVMETHOD(device_attach,	ppi_attach),
 	DEVMETHOD(device_detach,	ppi_detach),
-
 	{ 0, 0 }
 };
 

Modified: head/sys/dev/ppbus/pps.c
==============================================================================
--- head/sys/dev/ppbus/pps.c	Tue Sep  1 21:58:56 2020	(r365175)
+++ head/sys/dev/ppbus/pps.c	Tue Sep  1 21:59:11 2020	(r365176)
@@ -333,7 +333,6 @@ static device_method_t pps_methods[] = {
 	DEVMETHOD(device_identify,	ppsidentify),
 	DEVMETHOD(device_probe,		ppsprobe),
 	DEVMETHOD(device_attach,	ppsattach),
-
 	{ 0, 0 }
 };
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009012159.081LxBLg048330>