Author: adrian
Date: Fri Jun 26 04:12:06 2015
New Revision: 284865
URL: https://svnweb.freebsd.org/changeset/base/284865
Log:
Rename seq_* to mseq_*, to avoid clashes with seq.h (namely, seq_read.)
Modified:
head/sys/dev/sound/midi/sequencer.c
Modified: head/sys/dev/sound/midi/sequencer.c
==============================================================================
--- head/sys/dev/sound/midi/sequencer.c Fri Jun 26 03:29:23 2015
(r284864)
+++ head/sys/dev/sound/midi/sequencer.c Fri Jun 26 04:12:06 2015
(r284865)
@@ -98,21 +98,21 @@ __FBSDID("$FreeBSD$");
#define MIDIDEV(y) (dev2unit(y) & 0x0f)
/* These are the entries to the sequencer driver. */
-static d_open_t seq_open;
-static d_close_t seq_close;
-static d_ioctl_t seq_ioctl;
-static d_read_t seq_read;
-static d_write_t seq_write;
-static d_poll_t seq_poll;
+static d_open_t mseq_open;
+static d_close_t mseq_close;
+static d_ioctl_t mseq_ioctl;
+static d_read_t mseq_read;
+static d_write_t mseq_write;
+static d_poll_t mseq_poll;
static struct cdevsw seq_cdevsw = {
.d_version = D_VERSION,
- .d_open = seq_open,
- .d_close = seq_close,
- .d_read = seq_read,
- .d_write = seq_write,
- .d_ioctl = seq_ioctl,
- .d_poll = seq_poll,
+ .d_open = mseq_open,
+ .d_close = mseq_close,
+ .d_read = mseq_read,
+ .d_write = mseq_write,
+ .d_ioctl = mseq_ioctl,
+ .d_poll = mseq_poll,
.d_name = "sequencer",
};
@@ -737,7 +737,7 @@ seq_fetch_mid(struct seq_softc *scp, int
}
int
-seq_open(struct cdev *i_dev, int flags, int mode, struct thread *td)
+mseq_open(struct cdev *i_dev, int flags, int mode, struct thread *td)
{
struct seq_softc *scp = i_dev->si_drv1;
int i;
@@ -817,10 +817,10 @@ seq_open(struct cdev *i_dev, int flags,
}
/*
- * seq_close
+ * mseq_close
*/
int
-seq_close(struct cdev *i_dev, int flags, int mode, struct thread *td)
+mseq_close(struct cdev *i_dev, int flags, int mode, struct thread *td)
{
int i;
struct seq_softc *scp = i_dev->si_drv1;
@@ -858,7 +858,7 @@ err:
}
int
-seq_read(struct cdev *i_dev, struct uio *uio, int ioflag)
+mseq_read(struct cdev *i_dev, struct uio *uio, int ioflag)
{
int retval, used;
struct seq_softc *scp = i_dev->si_drv1;
@@ -869,12 +869,12 @@ seq_read(struct cdev *i_dev, struct uio
if (scp == NULL)
return ENXIO;
- SEQ_DEBUG(7, printf("seq_read: unit %d, resid %zd.\n",
+ SEQ_DEBUG(7, printf("mseq_read: unit %d, resid %zd.\n",
scp->unit, uio->uio_resid));
mtx_lock(&scp->seq_lock);
if ((scp->fflags & FREAD) == 0) {
- SEQ_DEBUG(2, printf("seq_read: unit %d is not for reading.\n",
+ SEQ_DEBUG(2, printf("mseq_read: unit %d is not for reading.\n",
scp->unit));
retval = EIO;
goto err1;
@@ -927,14 +927,14 @@ seq_read(struct cdev *i_dev, struct uio
retval = 0;
err1:
mtx_unlock(&scp->seq_lock);
- SEQ_DEBUG(6, printf("seq_read: ret %d, resid %zd.\n",
+ SEQ_DEBUG(6, printf("mseq_read: ret %d, resid %zd.\n",
retval, uio->uio_resid));
return retval;
}
int
-seq_write(struct cdev *i_dev, struct uio *uio, int ioflag)
+mseq_write(struct cdev *i_dev, struct uio *uio, int ioflag)
{
u_char event[EV_SZ], newevent[EV_SZ], ev_code;
struct seq_softc *scp = i_dev->si_drv1;
@@ -1113,7 +1113,7 @@ err0:
}
int
-seq_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode,
+mseq_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode,
struct thread *td)
{
int midiunit, ret, tmp;
@@ -1417,7 +1417,7 @@ timerevent:
}
int
-seq_poll(struct cdev *i_dev, int events, struct thread *td)
+mseq_poll(struct cdev *i_dev, int events, struct thread *td)
{
int ret, lim;
struct seq_softc *scp = i_dev->si_drv1;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
