Remove the version 1.03 of the mlan API.

11 files changed, 0 insertions, 471 deletions

diff --git a/comms/Makefile b/comms/Makefile
index e46dbdf6fb0f..a0895fcfc66f 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -84,7 +84,6 @@
     SUBDIR += lrzsz
     SUBDIR += mgetty+sendfax
     SUBDIR += minicom
-    SUBDIR += mlan
     SUBDIR += mlan3
     SUBDIR += morse
     SUBDIR += nasawash
diff --git a/comms/mlan/Makefile b/comms/mlan/Makefile
deleted file mode 100644
index 0ceed10f198f..000000000000
--- a/comms/mlan/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: phk
-# $FreeBSD$
-
-PORTNAME=	mlan
-PORTVERSION=	1.03
-CATEGORIES=	comms
-MASTER_SITES=	ftp://ftp.dalsemi.com/pub/auto_id/public/
-DISTNAME=	mlpb103
-
-MAINTAINER=	phk@FreeBSD.org
-COMMENT=	API for Dallas Semiconductors 1-wire lan devices
-
-NO_WRKSUBDIR=	yes
-USE_ZIP=	yes
-
-NO_STAGE=	yes
-.include <bsd.port.mk>
diff --git a/comms/mlan/distinfo b/comms/mlan/distinfo
deleted file mode 100644
index 5079cc7e539c..000000000000
--- a/comms/mlan/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mlpb103.zip) = 44b00a2b3725c3588cc19b0036b2442c3301b7af01c455f8adac7c265c832131
-SIZE (mlpb103.zip) = 630868
diff --git a/comms/mlan/files/patch-aa b/comms/mlan/files/patch-aa
deleted file mode 100644
index f0d32b32bcfb..000000000000
--- a/comms/mlan/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u --new-file -r ../R1/source/apps/tstmlane/tstmlane.c ./source/apps/tstmlane/tstmlane.c
---- ../R1/source/apps/tstmlane/tstmlane.c	Tue Jun  8 01:03:00 1999
-+++ ./source/apps/tstmlane/tstmlane.c	Tue Jan  4 21:32:02 2000
-@@ -36,7 +36,6 @@
- 

- #include <stdio.h>

- #include <stdlib.h>

--#include <windows.h>

- #include "mlan.h"

- 

- // external MLan functions to test

-diff -u --new-file -r ../R1/source/lib/userial/ds2480ut.c ./source/lib/userial/ds2480ut.c
---- ../R1/source/lib/userial/ds2480ut.c	Tue Jun  8 01:03:00 1999
-+++ ./source/lib/userial/ds2480ut.c	Tue Jan  4 21:23:04 2000
-@@ -92,6 +92,7 @@
-    if (WriteCOM(1,sendpacket) != 1) 

-       return FALSE;

- 

-+   sendpacket[sendlen++] = 0xC1;

-    // set the FLEX configuration parameters

-    // default PDSRC = 1.37Vus

-    sendpacket[sendlen++] = CMD_CONFIG | PARMSEL_SLEW | PARMSET_Slew1p37Vus;

diff --git a/comms/mlan/files/patch-ab b/comms/mlan/files/patch-ab
deleted file mode 100644
index 14aeeccf98c6..000000000000
--- a/comms/mlan/files/patch-ab
+++ /dev/null
@@ -1,373 +0,0 @@
-diff -u --new-file -r ../R1/examples/freebsd/Makefile ./examples/freebsd/Makefile
---- ../R1/examples/freebsd/Makefile	Thu Jan  1 01:00:00 1970
-+++ ./examples/freebsd/Makefile	Tue Jan  4 21:25:14 2000
-@@ -0,0 +1,3 @@
-+SUBDIR= lib mweather thermodl thermos tstfind tstmlan tstmlane
-+
-+.include <bsd.subdir.mk>
-diff -u --new-file -r ../R1/examples/freebsd/lib/Makefile ./examples/freebsd/lib/Makefile
---- ../R1/examples/freebsd/lib/Makefile	Thu Jan  1 01:00:00 1970
-+++ ./examples/freebsd/lib/Makefile	Tue Jan  4 21:40:23 2000
-@@ -0,0 +1,28 @@
-+
-+MLANDIR=	${.CURDIR}/../../../source/lib/userial
-+.PATH:		${.CURDIR} ${MLANDIR}
-+LIB=		mlan
-+CFLAGS=		-I. -DUCHAR -Wall
-+NOPROFILE=	yes
-+PREFIX?=	/usr/local
-+LIBDIR=		${PREFIX}/lib
-+
-+SRCS=		mlanfile.c mlanllu.c mlannetu.c mlansesu.c mlantrnu.c 
-+SRCS+=		ds2480ut.c
-+SRCS+=		serial.c
-+
-+serial.c:	mlan.h
-+
-+CLEANFILES+=	mlan.h
-+
-+beforedepend:	mlan.h
-+		@true
-+
-+mlan.h:		${MLANDIR}/mlan.h
-+		cp ${MLANDIR}/mlan.h .
-+
-+beforeinstall:
-+		${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+			${_INSTALLFLAGS} mlan.h ${DESTDIR}/${PREFIX}/include
-+
-+.include <bsd.lib.mk>
-diff -u --new-file -r ../R1/examples/freebsd/lib/serial.c ./examples/freebsd/lib/serial.c
---- ../R1/examples/freebsd/lib/serial.c	Thu Jan  1 01:00:00 1970
-+++ ./examples/freebsd/lib/serial.c	Tue Jan  4 21:22:19 2000
-@@ -0,0 +1,202 @@
-+//---------------------------------------------------------------------------
-+// Copyright (C) 1999 Dallas Semiconductor Corporation, All Rights Reserved.
-+// 
-+// Permission is hereby granted, free of charge, to any person obtaining a 
-+// copy of this software and associated documentation files (the "Software"), 
-+// to deal in the Software without restriction, including without limitation 
-+// the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-+// and/or sell copies of the Software, and to permit persons to whom the 
-+// Software is furnished to do so, subject to the following conditions:
-+// 
-+// The above copyright notice and this permission notice shall be included 
-+// in all copies or substantial portions of the Software.
-+// 
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
-+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-+// MERCHANTABILITY,  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-+// IN NO EVENT SHALL DALLAS SEMICONDUCTOR BE LIABLE FOR ANY CLAIM, DAMAGES 
-+// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 
-+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
-+// OTHER DEALINGS IN THE SOFTWARE.
-+// 
-+// Except as contained in this notice, the name of Dallas Semiconductor 
-+// shall not be used except as stated in the Dallas Semiconductor 
-+// Branding Policy. 
-+//---------------------------------------------------------------------------
-+//
-+//  TODO.C - COM functions required by MLANLL.C, MLANTRNU, MLANNETU.C and
-+//           MLanFile.C for MLANU to communicate with the DS2480 based 
-+//           Universal Serial Adapter 'U'.  Fill in the platform specific code.
-+//
-+//  Version: 1.03
-+//
-+//  History: 1.00 -> 1.01  Added function msDelay. 
-+//
-+//           1.01 -> 1.02  Changed to generic OpenCOM/CloseCOM for easier 
-+//                         use with other platforms.
-+//           
-+//           1.02 -> 1.03  Removed caps in #includes for Linux capatibility
-+//                         Add function msGettick()
-+//
-+
-+#include "mlan.h"
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <termios.h>
-+#include <sys/time.h>
-+
-+// exportable functions required for 
-+// MLANLL.C, MLANTRNU, or MLANNETU.C 
-+void FlushCOM(void);
-+int WriteCOM(int, uchar *);
-+int ReadCOM(int, uchar *);
-+void BreakCOM(void);
-+void msDelay(int);
-+void SetBaudCOM(int);
-+int  OpenCOM(char *);
-+void CloseCOM(void);
-+long msGettick(void);
-+
-+static int dsfd;
-+static struct termios pstio;
-+
-+//---------------------------------------------------------------------------
-+//  Description:
-+//     flush the rx and tx buffers
-+//
-+void FlushCOM(void)
-+{
-+   tcflush(dsfd, TCIOFLUSH);
-+}
-+
-+
-+//--------------------------------------------------------------------------
-+// Write an array of bytes to the COM port, verify that it was
-+// sent out.  Assume that baud rate has been set.
-+//
-+// Returns 1 for success and 0 for failure
-+//
-+int WriteCOM(int outlen, uchar *outbuf)
-+{
-+
-+   if (outlen == write(dsfd, outbuf, outlen))
-+	return 1;
-+   return 0;
-+}
-+
-+
-+//--------------------------------------------------------------------------
-+// Read an array of bytes to the COM port, verify that it was
-+// sent out.  Assume that baud rate has been set.
-+//
-+// Returns number of characters read
-+//
-+int ReadCOM(int inlen, uchar *inbuf)
-+{
-+   int i, j;
-+
-+   for(j = 0; j < inlen; ) {
-+      i = read(dsfd, inbuf + j, inlen -j);
-+      if (i <= 0)
-+         break;
-+      j += i;
-+   }
-+   return j;
-+}
-+
-+
-+//--------------------------------------------------------------------------
-+//  Description:
-+//     Send a break on the com port for at least 2 ms
-+// 
-+void BreakCOM(void)
-+{
-+   tcsendbreak(dsfd, 1);
-+}
-+
-+
-+//--------------------------------------------------------------------------
-+//  Description:
-+//     Delay for at least 'len' ms
-+// 
-+void msDelay(int len)
-+{
-+   usleep(len * 1000);
-+}
-+
-+
-+//--------------------------------------------------------------------------
-+// Set the baud rate on the com port.  The possible baud rates for
-+// 'new_baud' are:
-+//
-+// PARMSET_9600     0x00
-+// PARMSET_19200    0x02
-+// PARMSET_57600    0x04
-+// PARMSET_115200   0x06
-+// 
-+void SetBaudCOM(int new_baud)
-+{
-+   switch (new_baud) {
-+   case 0x00 /* PARMSET_9600   */: cfsetspeed(&pstio, B9600); break;
-+   case 0x02 /* PARMSET_19200  */: cfsetspeed(&pstio, B19200); break;
-+   case 0x04 /* PARMSET_57600  */: cfsetspeed(&pstio, B57600); break;
-+   case 0x06 /* PARMSET_115200 */: cfsetspeed(&pstio, B115200); break;
-+   }
-+   tcsetattr(dsfd, TCSANOW, &pstio);
-+}
-+
-+
-+//---------------------------------------------------------------------------
-+// Attempt to open a com port.  
-+// Set the starting baud rate to 9600.
-+//
-+// 'port_zstr' - zero terminate port name.  Format is platform
-+//               dependent.
-+//
-+// Returns: TRUE - success, COM port opened
-+//
-+int OpenCOM(char *port_zstr)
-+{
-+   int i;
-+
-+   dsfd = open(port_zstr, O_RDWR, 0);
-+   if (dsfd < 0)
-+       return (0);
-+   i = tcgetattr(dsfd, &pstio);
-+   if (i < 0) {
-+       close(dsfd);
-+       return (0);
-+   }
-+   cfmakeraw(&pstio);
-+   pstio.c_cc[VTIME] = 20;
-+   pstio.c_cc[VMIN] = 0;
-+   cfsetspeed(&pstio, B9600);
-+   i = tcsetattr(dsfd, TCSANOW, &pstio);
-+   if (i < 0) {
-+       close(dsfd);
-+       return (0);
-+   }
-+   return 1;
-+}
-+
-+
-+//---------------------------------------------------------------------------
-+// Closes the connection to the port.
-+//
-+void CloseCOM(void)
-+{
-+   close(dsfd);
-+}
-+
-+
-+//--------------------------------------------------------------------------
-+// Get the current millisecond tick count.  Does not have to represent
-+// an actual time, it just needs to be an incrementing timer.
-+//
-+long msGettick(void)
-+{
-+   struct timeval tv;
-+
-+   gettimeofday(&tv, NULL);
-+   return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
-+}
-diff -u --new-file -r ../R1/examples/freebsd/mweather/Makefile ./examples/freebsd/mweather/Makefile
---- ../R1/examples/freebsd/mweather/Makefile	Thu Jan  1 01:00:00 1970
-+++ ./examples/freebsd/mweather/Makefile	Tue Jan  4 21:39:47 2000
-@@ -0,0 +1,17 @@
-+
-+PROG=		mweather
-+
-+PREFIX?=	/usr/local
-+BINDIR=		${PREFIX}/bin
-+MLANDIR=	${.CURDIR}/../../../source/
-+MLANLIB=	${.CURDIR}/../lib
-+.PATH:		${MLANDIR}/apps/${PROG}
-+CFLAGS=		-I${MLANLIB} -DUCHAR -Wall
-+LDADD=		-L${MLANLIB} -lmlan
-+DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
-+
-+test:		${PROG}
-+		./${PROG} /dev/cuaa0
-+
-+.include <bsd.prog.mk>
-diff -u --new-file -r ../R1/examples/freebsd/thermodl/Makefile ./examples/freebsd/thermodl/Makefile
---- ../R1/examples/freebsd/thermodl/Makefile	Thu Jan  1 01:00:00 1970
-+++ ./examples/freebsd/thermodl/Makefile	Tue Jan  4 21:39:51 2000
-@@ -0,0 +1,18 @@
-+
-+PROG=		thermodl
-+SRCS=		thermodl.c thermout.c
-+
-+PREFIX?=	/usr/local
-+BINDIR=		${PREFIX}/bin
-+MLANDIR=	${.CURDIR}/../../../source/
-+MLANLIB=	${.CURDIR}/../lib
-+.PATH:		${MLANDIR}/apps/thermo
-+CFLAGS=		-I${MLANLIB} -DUCHAR -Wall
-+LDADD=		-L${MLANLIB} -lmlan
-+DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
-+
-+test:		${PROG}
-+		./${PROG} /dev/cuaa0
-+
-+.include <bsd.prog.mk>
-diff -u --new-file -r ../R1/examples/freebsd/thermos/Makefile ./examples/freebsd/thermos/Makefile
---- ../R1/examples/freebsd/thermos/Makefile	Thu Jan  1 01:00:00 1970
-+++ ./examples/freebsd/thermos/Makefile	Tue Jan  4 21:39:51 2000
-@@ -0,0 +1,18 @@
-+
-+PROG=		thermoms
-+SRCS=		thermoms.c thermout.c
-+
-+PREFIX?=	/usr/local
-+BINDIR=		${PREFIX}/bin
-+MLANDIR=	${.CURDIR}/../../../source/
-+MLANLIB=	${.CURDIR}/../lib
-+.PATH:		${MLANDIR}/apps/thermo
-+CFLAGS=		-I${MLANLIB} -DUCHAR -Wall
-+LDADD=		-L${MLANLIB} -lmlan
-+DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
-+
-+test:		${PROG}
-+		./${PROG} /dev/cuaa0
-+
-+.include <bsd.prog.mk>
-diff -u --new-file -r ../R1/examples/freebsd/tstfind/Makefile ./examples/freebsd/tstfind/Makefile
---- ../R1/examples/freebsd/tstfind/Makefile	Thu Jan  1 01:00:00 1970
-+++ ./examples/freebsd/tstfind/Makefile	Tue Jan  4 21:39:31 2000
-@@ -0,0 +1,17 @@
-+
-+PROG=		tstfind
-+
-+PREFIX?=	/usr/local
-+BINDIR=		${PREFIX}/bin
-+MLANDIR=	${.CURDIR}/../../../source/
-+MLANLIB=	${.CURDIR}/../lib
-+.PATH:		${MLANDIR}/apps/${PROG}
-+CFLAGS=		-I${MLANLIB} -DUCHAR -Wall
-+LDADD=		-L${MLANLIB} -lmlan
-+DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
-+
-+test:		${PROG}
-+		./${PROG} /dev/cuaa0
-+
-+.include <bsd.prog.mk>
-diff -u --new-file -r ../R1/examples/freebsd/tstmlan/Makefile ./examples/freebsd/tstmlan/Makefile
---- ../R1/examples/freebsd/tstmlan/Makefile	Thu Jan  1 01:00:00 1970
-+++ ./examples/freebsd/tstmlan/Makefile	Tue Jan  4 21:39:57 2000
-@@ -0,0 +1,17 @@
-+
-+PROG=		tstmlan
-+
-+PREFIX?=	/usr/local
-+BINDIR=		${PREFIX}/bin
-+MLANDIR=	${.CURDIR}/../../../source/
-+MLANLIB=	${.CURDIR}/../lib
-+.PATH:		${MLANDIR}/apps/${PROG}
-+CFLAGS=		-I${MLANLIB} -DUCHAR -Wall
-+LDADD=		-L${MLANLIB} -lmlan
-+DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
-+
-+test:		${PROG}
-+		./${PROG} /dev/cuaa0
-+
-+.include <bsd.prog.mk>
-diff -u --new-file -r ../R1/examples/freebsd/tstmlane/Makefile ./examples/freebsd/tstmlane/Makefile
---- ../R1/examples/freebsd/tstmlane/Makefile	Thu Jan  1 01:00:00 1970
-+++ ./examples/freebsd/tstmlane/Makefile	Tue Jan  4 21:40:03 2000
-@@ -0,0 +1,17 @@
-+
-+PROG=		tstmlane
-+
-+PREFIX?=	/usr/local
-+BINDIR=		${PREFIX}/bin
-+MLANDIR=	${.CURDIR}/../../../source/
-+MLANLIB=	${.CURDIR}/../lib
-+.PATH:		${MLANDIR}/apps/${PROG}
-+CFLAGS=		-I${MLANLIB} -DUCHAR -Wall
-+LDADD=		-L${MLANLIB} -lmlan
-+DPADD=		${MLANLIB}/libmlan.a
-+NOMAN=		1
-+
-+test:		${PROG}
-+		./${PROG} /dev/cuaa0
-+
-+.include <bsd.prog.mk>
diff --git a/comms/mlan/files/patch-ac b/comms/mlan/files/patch-ac
deleted file mode 100644
index fc551bb53bf8..000000000000
--- a/comms/mlan/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur --new-file ./Makefile ../../A1/Makefile
---- ../../A1/Makefile	Thu Jan  1 01:00:00 1970
-+++ ./Makefile	Tue Jan  4 22:04:35 2000
-@@ -0,0 +1,7 @@
-+
-+all:
-+	cd examples/freebsd ; make all
-+
-+install:
-+	cd examples/freebsd ; make install
-+
diff --git a/comms/mlan/files/patch-ad b/comms/mlan/files/patch-ad
deleted file mode 100644
index 037bc10d5326..000000000000
--- a/comms/mlan/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./source/apps/thermo/thermo.h.orig	Sat Sep 28 23:52:11 2002
-+++ ./source/apps/thermo/thermo.h	Sat Sep 28 23:52:21 2002
-@@ -18,6 +18,8 @@
- //

- //  Version: 1.03

- //

-+
-+#include <sys/types.h>
- 

- 

- #ifndef THERMO_TYPES

diff --git a/comms/mlan/files/patch-ae b/comms/mlan/files/patch-ae
deleted file mode 100644
index 4bd6aac19de3..000000000000
--- a/comms/mlan/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./source/lib/general/mlan.h.orig	Sat Sep 28 23:53:45 2002
-+++ ./source/lib/general/mlan.h	Sat Sep 28 23:53:54 2002
-@@ -34,7 +34,6 @@
- #ifndef MLAN_UCHAR

-    #define MLAN_UCHAR

-    typedef unsigned char  uchar;

--   typedef unsigned short ushort;

-    typedef unsigned long  ulong;

- #endif

- 

diff --git a/comms/mlan/files/patch-af b/comms/mlan/files/patch-af
deleted file mode 100644
index 17296c3b2522..000000000000
--- a/comms/mlan/files/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./source/lib/userial/mlan.h.orig	Sat Sep 28 23:54:17 2002
-+++ ./source/lib/userial/mlan.h	Sat Sep 28 23:53:58 2002
-@@ -34,7 +34,6 @@
- #ifndef MLAN_UCHAR

-    #define MLAN_UCHAR

-    typedef unsigned char  uchar;

--   typedef unsigned short ushort;

-    typedef unsigned long  ulong;

- #endif

- 

diff --git a/comms/mlan/pkg-descr b/comms/mlan/pkg-descr
deleted file mode 100644
index 8b564064125b..000000000000
--- a/comms/mlan/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-A port of Dallas Semiconductors TMEX api for accessing 1-wire LAN
-devices.  Only DS2480 serial port adapters are supported by this port.
-
-More doc & src at: ftp://ftp.dalsemi.com/pub/auto_id/softdev/softdev.html
-
-WWW: http://www.ibutton.com/
diff --git a/comms/mlan/pkg-plist b/comms/mlan/pkg-plist
deleted file mode 100644
index 64bf93f79aaa..000000000000
--- a/comms/mlan/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/mweather
-bin/thermodl
-bin/thermoms
-bin/tstfind
-bin/tstmlan
-bin/tstmlane
-include/mlan.h
-lib/libmlan.a