Changes for devfs.
This commit is contained in:
parent
533ad83094
commit
4da8b84ac1
|
@ -1,4 +1,7 @@
|
|||
$Id: CHANGES,v 1.4 2000/06/07 21:08:35 armin Exp $
|
||||
$Id: CHANGES,v 1.5 2000/07/08 14:18:52 armin Exp $
|
||||
|
||||
V2.2 - 2000-07-08 - Capable for 2.4 devfs.
|
||||
("/dev/isdnctrl" -> "/dev/isdn/isdnctrl")
|
||||
|
||||
V2.1 - 2000-06-07 - Fixed OAD, OSA and SPID parameter settings.
|
||||
Thanks to Brian Moran.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Eiconctrl user utility and firmware for supported active ISDN cards
|
||||
from Eicon Technology.
|
||||
|
||||
Version 2.1 (c) 2000 Cytronics & Melware
|
||||
Version 2.2 (c) 2000 Cytronics & Melware
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
|
@ -699,6 +699,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
/* open the driver */
|
||||
|
||||
if ((log_fd = open(DIVAS_DEVICE_DFS, O_RDONLY)) < 0)
|
||||
if ((log_fd = open(DIVAS_DEVICE, O_RDONLY)) == -1)
|
||||
{
|
||||
perror("divalogd: open of log device");
|
||||
|
|
|
@ -100,6 +100,7 @@ int main( int argc, char *argv[] )
|
|||
bzero(&card, sizeof(dia_card_t));
|
||||
|
||||
printf("divaload: Firmware loader for Eicon DIVA Server ISDN adapters\n");
|
||||
if ((dev_id = open(DIVAS_DEVICE_DFS, O_RDONLY, 0)) < 0)
|
||||
if ((dev_id = open(DIVAS_DEVICE, O_RDONLY, 0)) == -1)
|
||||
{
|
||||
fprintf(stderr, "Couldn't open %s\n", DIVAS_DEVICE);
|
||||
|
|
|
@ -825,6 +825,7 @@ int download(char *block, dword size, int code)
|
|||
load.card_id = card_id;
|
||||
|
||||
/* open the Divas device */
|
||||
if ((fd = open(DIVAS_DEVICE_DFS, O_RDONLY, 0)) < 0)
|
||||
if ((fd = open(DIVAS_DEVICE, O_RDONLY, 0)) == -1)
|
||||
{
|
||||
perror("Error opening DIVA Server device");
|
||||
|
|
|
@ -79,6 +79,7 @@ int DivaALoad(char *dsp_name, dia_config_t *options, dia_card_t *card, char *msg
|
|||
start.card_id = options->card_id;
|
||||
|
||||
/* open the Divas device */
|
||||
if ((loadfd = open(DIVAS_DEVICE_DFS, O_RDONLY, 0)) < 0)
|
||||
if ((loadfd = open(DIVAS_DEVICE, O_RDONLY, 0)) == -1)
|
||||
{
|
||||
sprintf(msg,DIVAS_DEVICE);
|
||||
|
@ -240,6 +241,7 @@ int DivaALoad(char *dsp_name, dia_config_t *options, dia_card_t *card, char *msg
|
|||
}
|
||||
|
||||
/* open the Divas device */
|
||||
if ((loadfd = open(DIVAS_DEVICE_DFS, O_RDONLY, 0)) < 0)
|
||||
if ((loadfd = open(DIVAS_DEVICE, O_RDONLY, 0)) == -1)
|
||||
{
|
||||
sprintf(msg,DIVAS_DEVICE);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: eiconctrl.c,v 1.19 2000/06/12 12:29:06 armin Exp $
|
||||
/* $Id: eiconctrl.c,v 1.20 2000/07/08 14:18:52 armin Exp $
|
||||
*
|
||||
* Eicon-ISDN driver for Linux. (Control-Utility)
|
||||
*
|
||||
|
@ -21,6 +21,9 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: eiconctrl.c,v $
|
||||
* Revision 1.20 2000/07/08 14:18:52 armin
|
||||
* Changes for devfs.
|
||||
*
|
||||
* Revision 1.19 2000/06/12 12:29:06 armin
|
||||
* removed compiler warnings.
|
||||
*
|
||||
|
@ -208,7 +211,7 @@ char *spid_state[] =
|
|||
__u16 xlog(FILE * stream,void * buffer);
|
||||
|
||||
void eiconctrl_usage() {
|
||||
fprintf(stderr,"Eiconctrl Utility Version 2.1 (c) 2000 Cytronics & Melware\n");
|
||||
fprintf(stderr,"Eiconctrl Utility Version 2.2 (c) 2000 Cytronics & Melware\n");
|
||||
fprintf(stderr,"usage: %s add <DriverID> <membase> <irq> (add card)\n",cmd);
|
||||
fprintf(stderr," or: %s [-d <DriverID>] membase [membase-addr] (get/set memaddr)\n",cmd);
|
||||
fprintf(stderr," or: %s [-d <DriverID>] irq [irq-nr] (get/set irq)\n",cmd);
|
||||
|
@ -1390,7 +1393,9 @@ int main(int argc, char **argv) {
|
|||
ac = argc - (arg_ofs - 1);
|
||||
if (arg_ofs >= argc)
|
||||
eiconctrl_usage();
|
||||
fd = open("/dev/isdnctrl",O_RDWR | O_NONBLOCK);
|
||||
fd = open("/dev/isdn/isdnctrl",O_RDWR | O_NONBLOCK);
|
||||
if (fd < 0)
|
||||
fd = open("/dev/isdnctrl",O_RDWR | O_NONBLOCK);
|
||||
if (fd < 0) {
|
||||
perror("/dev/isdnctrl");
|
||||
exit(-1);
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
.\" $Id: eiconctrl.man.in,v 1.10 2000/06/08 08:31:03 armin Exp $
|
||||
.\" $Id: eiconctrl.man.in,v 1.11 2000/07/08 14:18:52 armin Exp $
|
||||
.\"
|
||||
.\" CHECKIN $Date: 2000/06/08 08:31:03 $
|
||||
.\" CHECKIN $Date: 2000/07/08 14:18:52 $
|
||||
.\"
|
||||
.\" Process this file with
|
||||
.\" groff -man -Tascii eiconctrl.1 for ASCII output, or
|
||||
.\" groff -man -Tps eiconctrl.1 for PostScript output
|
||||
.\"
|
||||
.TH EICONCTRL 8 "@MANDATE@" eiconctrl-V2.1 "Linux System Administration"
|
||||
.TH EICONCTRL 8 "@MANDATE@" eiconctrl-V2.2 "Linux System Administration"
|
||||
.SH NAME
|
||||
eiconctrl \- configure Eicon active ISDN card
|
||||
.SH SYNOPSIS
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: linuxcfg.h,v 1.1 2000/03/25 12:56:40 armin Exp $
|
||||
/* $Id: linuxcfg.h,v 1.2 2000/07/08 14:18:52 armin Exp $
|
||||
*
|
||||
* Eicon-ISDN driver for Linux. (Config)
|
||||
*
|
||||
|
@ -20,6 +20,9 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* $Log: linuxcfg.h,v $
|
||||
* Revision 1.2 2000/07/08 14:18:52 armin
|
||||
* Changes for devfs.
|
||||
*
|
||||
* Revision 1.1 2000/03/25 12:56:40 armin
|
||||
* First checkin of new version 2.0
|
||||
* - support for 4BRI, includes orig Eicon
|
||||
|
@ -35,6 +38,7 @@
|
|||
|
||||
#define main(a,b) Divaload_main(a,b)
|
||||
#define DIVAS_DEVICE "/dev/isdnctrl"
|
||||
#define DIVAS_DEVICE_DFS "/dev/isdn/isdnctrl"
|
||||
#define ioctl(a,b,c) Divas_ioctl(a,b,c)
|
||||
extern int Divas_ioctl(int, int, void *);
|
||||
|
||||
|
@ -44,6 +48,7 @@ extern int Divas_ioctl(int, int, void *);
|
|||
/* config for standalone */
|
||||
|
||||
#define DIVAS_DEVICE "/dev/Divas"
|
||||
#define DIVAS_DEVICE_DFS "/dev/Divas"
|
||||
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue