Date: Mon, 3 Mar 2003 14:12:48 +0300 (MSK) From: "Sergey A.Osokin" <osa@FreeBSD.org.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: darius@dons.net.au Subject: ports/48869: [PATCH] comms/ltmdm: fix sys/dkstat.h warning Message-ID: <20030303111248.90C1D17D@freebsd.org.ru>
next in thread | raw e-mail | index | archive | help
>Number: 48869
>Category: ports
>Synopsis: [PATCH] comms/ltmdm: fix sys/dkstat.h warning
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 03 03:20:05 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Sergey A. Osokin
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
n/a
>Environment:
System: FreeBSD 5.0-CURRENT #11: Sun Mar 2 17:15:53 MSK 2003
>Description:
fix sys/dkstat.h warning
>How-To-Repeat:
cd ports/comms/ltmdm && make
>Fix:
Index: ports/comms/ltmdm/files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/comms/ltmdm/files/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- ports/comms/ltmdm/files/patch-aa 2 Mar 2003 22:03:52 -0000 1.2
+++ ports/comms/ltmdm/files/patch-aa 3 Mar 2003 11:04:59 -0000
@@ -1,6 +1,16 @@
---- sys/dev/ltmdm/ltmdmsio.c.orig Tue Mar 12 03:47:31 2002
-+++ sys/dev/ltmdm/ltmdmsio.c Sun Mar 2 23:49:45 2003
-@@ -69,9 +69,13 @@
+--- sys/dev/ltmdm/ltmdmsio.c.orig Tue Mar 12 04:47:31 2002
++++ sys/dev/ltmdm/ltmdmsio.c Mon Mar 3 13:59:56 2003
+@@ -60,7 +60,9 @@
+ #include <sys/proc.h>
+ #include <sys/module.h>
+ #include <sys/conf.h>
++#if __FreeBSD_version < 500101
+ #include <sys/dkstat.h>
++#endif
+ #include <sys/fcntl.h>
+ #include <sys/interrupt.h>
+ #include <sys/kernel.h>
+@@ -69,9 +71,13 @@
#include <machine/bus.h>
#include <sys/rman.h>
#if __FreeBSD_version >= 500000
@@ -14,7 +24,7 @@
#include <pci/pcireg.h>
#include <pci/pcivar.h>
-@@ -124,9 +128,11 @@
+@@ -124,9 +130,11 @@
#endif
#if __FreeBSD_version >= 500023 /* >= 20010912 */
@@ -27,7 +37,7 @@
#define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */
-@@ -256,7 +262,9 @@
+@@ -256,7 +264,9 @@
bool_t do_dcd_timestamp;
struct timeval timestamp;
struct timeval dcd_timestamp;
@@ -37,7 +47,7 @@
u_long bytes_in; /* statistics */
u_long bytes_out;
-@@ -361,7 +369,11 @@
+@@ -361,7 +371,11 @@
/* mmap */ nommap,
/* strategy */ nostrategy,
/* name */ driver_name,
@@ -49,7 +59,7 @@
/* dump */ nodump,
/* psize */ nopsize,
#if __FreeBSD_version < 430000
-@@ -1295,8 +1307,11 @@
+@@ -1295,8 +1309,11 @@
DPRINTF(1,(" x_chip_version = %d\n", x_chip_version));
com->flags = flags;
@@ -61,7 +71,7 @@
/*
* initialize the device registers as follows:
-@@ -1685,7 +1700,9 @@
+@@ -1685,7 +1702,9 @@
s = splfunc();
com->do_timestamp = FALSE;
com->do_dcd_timestamp = FALSE;
@@ -71,7 +81,7 @@
write_vuart_port(UART_CFCR, com->cfcr_image &= ~CFCR_SBREAK);
{
write_vuart_port(UART_IER, 0);
-@@ -1894,23 +1911,34 @@
+@@ -1894,23 +1913,34 @@
u_char recv_data;
u_char int_ctl;
u_char int_ctl_new;
@@ -106,7 +116,7 @@
line_status = read_vuart_port(UART_LSR);
/* input event? (check first to help avoid overruns) */
-@@ -2195,7 +2223,9 @@
+@@ -2195,7 +2225,9 @@
break;
default:
splx(s);
@@ -116,7 +126,7 @@
if (error == ENODEV)
error = ENOTTY;
return (error);
-@@ -2796,7 +2826,7 @@
+@@ -2796,7 +2828,7 @@
#endif
DRIVER_MODULE(ltmdm, pci, ltmdm_pci_driver, ltmdm_devclass, ltmdm_event, 0);
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030303111248.90C1D17D>