Module Name: src
Committed By: isaki
Date: Wed Feb 3 14:44:32 UTC 2021
Modified Files:
src/sys/dev/pci: cs4280.c cs4281.c cs428x.h
Log Message:
Remove code no longer used.
The code that used sc->{halt_input,halt_output} function pointer
was removed in 2004. (see cs428x.c rev 1.7)
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/pci/cs4280.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/cs4281.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/cs428x.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/cs4280.c
diff -u src/sys/dev/pci/cs4280.c:1.72 src/sys/dev/pci/cs4280.c:1.73
--- src/sys/dev/pci/cs4280.c:1.72 Wed May 8 13:40:18 2019
+++ src/sys/dev/pci/cs4280.c Wed Feb 3 14:44:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280.c,v 1.72 2019/05/08 13:40:18 isaki Exp $ */
+/* $NetBSD: cs4280.c,v 1.73 2021/02/03 14:44:32 isaki Exp $ */
/*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.72 2019/05/08 13:40:18 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.73 2021/02/03 14:44:32 isaki Exp $");
#include "midi.h"
@@ -346,8 +346,6 @@ cs4280_attach(device_t parent, device_t
}
sc->type = TYPE_CS4280;
- sc->halt_input = cs4280_halt_input;
- sc->halt_output = cs4280_halt_output;
/* setup buffer related parameters */
sc->dma_size = CS4280_DCHUNK;
Index: src/sys/dev/pci/cs4281.c
diff -u src/sys/dev/pci/cs4281.c:1.56 src/sys/dev/pci/cs4281.c:1.57
--- src/sys/dev/pci/cs4281.c:1.56 Fri May 8 13:52:40 2020
+++ src/sys/dev/pci/cs4281.c Wed Feb 3 14:44:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4281.c,v 1.56 2020/05/08 13:52:40 simonb Exp $ */
+/* $NetBSD: cs4281.c,v 1.57 2021/02/03 14:44:32 isaki Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.56 2020/05/08 13:52:40 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.57 2021/02/03 14:44:32 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -272,8 +272,6 @@ cs4281_attach(device_t parent, device_t
}
sc->type = TYPE_CS4281;
- sc->halt_input = cs4281_halt_input;
- sc->halt_output = cs4281_halt_output;
sc->dma_size = CS4281_BUFFER_SIZE / MAX_CHANNELS;
sc->dma_align = 0x10;
Index: src/sys/dev/pci/cs428x.h
diff -u src/sys/dev/pci/cs428x.h:1.17 src/sys/dev/pci/cs428x.h:1.18
--- src/sys/dev/pci/cs428x.h:1.17 Wed May 8 13:40:18 2019
+++ src/sys/dev/pci/cs428x.h Wed Feb 3 14:44:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cs428x.h,v 1.17 2019/05/08 13:40:18 isaki Exp $ */
+/* $NetBSD: cs428x.h,v 1.18 2021/02/03 14:44:32 isaki Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -106,7 +106,6 @@ struct cs428x_softc {
int sc_pi;
struct cs428x_dma *sc_pdma;
char *sc_pbuf;
- int (*halt_output)(void *);
char sc_prun; /* playback status */
int sc_prate; /* playback sample rate */
@@ -118,7 +117,6 @@ struct cs428x_softc {
int sc_ri;
struct cs428x_dma *sc_rdma;
char *sc_rbuf;
- int (*halt_input)(void *);
char sc_rrun; /* recording status */
int sc_rrate; /* recording sample rate */
