Machine generated patch which changes linedisc calls from accessing

linesw[] directly to using the ttyld...() functions

The ttyld...() functions ar inline so there is no performance hit.

1 files changed, 8 insertions, 8 deletions

diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index ce064c4..6388387 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -454,7 +454,7 @@ siodetach(dev)
 				     com->ioportres);
 	if (com->tp && (com->tp->t_state & TS_ISOPEN)) {
 		device_printf(dev, "still open, forcing close\n");
-		(*linesw[com->tp->t_line].l_close)(com->tp, 0);
+		ttyld_close(com->tp, 0);
 		ttyclose(com->tp);
 	} else {
 		if (com->ibuf != NULL)
@@ -1335,7 +1335,7 @@ open_top:
 		 * the true carrier.
 		 */
 		if (com->prev_modem_status & MSR_DCD || mynor & CALLOUT_MASK)
-			(*linesw[tp->t_line].l_modem)(tp, 1);
+			ttyld_modem(tp, 1);
 	}
 	/*
 	 * Wait for DCD if necessary.
@@ -1351,7 +1351,7 @@ open_top:
 			goto out;
 		goto open_top;
 	}
-	error =	(*linesw[tp->t_line].l_open)(dev, tp);
+	error =	ttyld_open(tp, dev);
 	disc_optim(tp, &tp->t_termios, com);
 	if (tp->t_state & TS_ISOPEN && mynor & CALLOUT_MASK)
 		com->active_out = TRUE;
@@ -1383,7 +1383,7 @@ sioclose(dev, flag, mode, td)
 		return (ENODEV);
 	tp = com->tp;
 	s = spltty();
-	(*linesw[tp->t_line].l_close)(tp, flag);
+	ttyld_close(tp, flag);
 	disc_optim(tp, &tp->t_termios, com);
 	comhardclose(com);
 	ttyclose(tp);
@@ -1475,7 +1475,7 @@ sioread(dev, uio, flag)
 	com = com_addr(MINOR_TO_UNIT(mynor));
 	if (com == NULL || com->gone)
 		return (ENODEV);
-	return ((*linesw[com->tp->t_line].l_read)(com->tp, uio, flag));
+	return (ttyld_read(com->tp, uio, flag));
 }
 
 static int
@@ -1504,7 +1504,7 @@ siowrite(dev, uio, flag)
 	 */
 	if (constty != NULL && unit == comconsole)
 		constty = NULL;
-	return ((*linesw[com->tp->t_line].l_write)(com->tp, uio, flag));
+	return (ttyld_write(com->tp, uio, flag));
 }
 
 static void
@@ -1657,7 +1657,7 @@ sioinput(com)
 				if (line_status & LSR_PE)
 					recv_data |= TTY_PE;
 			}
-			(*linesw[tp->t_line].l_rint)(recv_data, tp);
+			ttyld_rint(tp, recv_data);
 			mtx_lock_spin(&sio_lock);
 		} while (buf < com->iptr);
 	}
@@ -2176,7 +2176,7 @@ repeat:
 				timeout(siobusycheck, com, hz / 100);
 				com->extra_state |= CSE_BUSYCHECK;
 			}
-			(*linesw[tp->t_line].l_start)(tp);
+			ttyld_start(tp);
 		}
 		if (com_events == 0)
 			break;