From b3e4e390f6df82c4bc1ab972586a39fea696fbff Mon Sep 17 00:00:00 2001
From: Steve Passe <fsmp@FreeBSD.org>
Date: Thu, 21 Aug 1997 05:47:25 +0000
Subject: Moved the COM_LOCK and COM_UNLOCK macros to machine/param.h.

---
 sys/dev/cy/cy.c     | 11 +----------
 sys/dev/cy/cy_isa.c | 11 +----------
 sys/dev/sio/sio.c   | 11 +----------
 3 files changed, 3 insertions(+), 30 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 5bcc40c5196c1..65647d3d592b1 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.1 1997/08/20 05:59:24 smp Exp smp $
+ *	$Id: cy.c,v 1.49 1997/08/20 06:16:44 fsmp Exp $
  */
 
 #include "cy.h"
@@ -84,15 +84,6 @@
 
 #include <machine/clock.h>
 
-#ifdef SMP
-#include <machine/smp.h>
-#define COM_LOCK() 	s_lock(&com_lock)
-#define COM_UNLOCK() 	s_unlock(&com_lock)
-#else
-#define COM_LOCK()
-#define COM_UNLOCK()
-#endif /* SMP */
-
 #include <i386/isa/isa_device.h>
 #include <i386/isa/cyreg.h>
 #include <i386/isa/ic/cd1400.h>
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 5bcc40c5196c1..65647d3d592b1 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.1 1997/08/20 05:59:24 smp Exp smp $
+ *	$Id: cy.c,v 1.49 1997/08/20 06:16:44 fsmp Exp $
  */
 
 #include "cy.h"
@@ -84,15 +84,6 @@
 
 #include <machine/clock.h>
 
-#ifdef SMP
-#include <machine/smp.h>
-#define COM_LOCK() 	s_lock(&com_lock)
-#define COM_UNLOCK() 	s_unlock(&com_lock)
-#else
-#define COM_LOCK()
-#define COM_UNLOCK()
-#endif /* SMP */
-
 #include <i386/isa/isa_device.h>
 #include <i386/isa/cyreg.h>
 #include <i386/isa/ic/cd1400.h>
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 52496981aba77..b64705129f9a6 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.174 1997/08/04 19:12:54 fsmp Exp $
+ *	$Id: sio.c,v 1.175 1997/08/20 05:25:16 fsmp Exp $
  */
 
 #include "opt_comconsole.h"
@@ -82,15 +82,6 @@
 #include <pccard/slot.h>
 #endif
 
-#ifdef SMP
-#include <machine/smp.h>
-#define COM_LOCK() 	s_lock(&com_lock)
-#define COM_UNLOCK() 	s_unlock(&com_lock)
-#else
-#define COM_LOCK()
-#define COM_UNLOCK()
-#endif /* SMP */
-
 #ifdef APIC_IO
 /*
  * INTs are masked in the (global) IO APIC,
-- 
cgit v1.3