Use the defined path to the card devices instead of hard-coding it's

value in every file.

No functional changes.
This commit is contained in:
Nate Williams 1996-06-17 22:14:19 +00:00
parent 42e35dc30b
commit c1f5e49952
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=16465
7 changed files with 17 additions and 15 deletions

View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: dumpcis.c,v 1.3 1996/04/10 05:45:30 nate Exp $
* $Id: dumpcis.c,v 1.4 1996/04/18 04:24:52 nate Exp $
*/
#include <stdio.h>
#include <unistd.h>
@ -47,7 +47,7 @@ scan(slot)
struct cis *cp;
struct slotstate st;
sprintf(name, "/dev/card%d", slot);
sprintf(name, CARD_DEVICE, slot);
fd = open(name, 0);
if (fd < 0)
return;

View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id$
* $Id: enabler.c,v 1.4 1996/04/18 04:24:53 nate Exp $
*/
#include <stdio.h>
#include <unistd.h>
@ -97,7 +97,7 @@ enabler_main(argc, argv)
printf("drv %s%d, mem 0x%lx, size %d, io %d, irq 0x%x, flags 0x%x\n",
drv.name, drv.unit, drv.mem, drv.memsize, drv.iobase,
drv.irqmask, drv.flags);
sprintf(name, "/dev/card%d", slot);
sprintf(name, CARD_DEVICE, slot);
fd = open(name, 2);
if (fd < 0) {
perror(name);

View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id$
* $Id: pccardmem.c,v 1.4 1996/04/18 04:24:54 nate Exp $
*/
#include <stdio.h>
#include <fcntl.h>
@ -37,6 +37,7 @@ pccardmem_main(argc, argv)
int argc;
char *argv[];
{
char name[64];
int addr = 0;
int fd;
@ -44,9 +45,10 @@ pccardmem_main(argc, argv)
fprintf(stderr, "usage: %s [ memory-address ]\n", argv[0]);
exit(1);
}
fd = open("/dev/card0", 0);
sprintf(name, CARD_DEVICE, 0);
fd = open(name, 0);
if (fd < 0) {
perror("/dev/card0");
perror(name);
exit(1);
}
if (argc == 2) {

View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id$
* $Id: rdmap.c,v 1.4 1996/04/18 04:24:56 nate Exp $
*/
#include <stdio.h>
#include <unistd.h>
@ -73,7 +73,7 @@ scan(slot)
char name[64];
struct slotstate st;
sprintf(name, "/dev/card%d", slot);
sprintf(name, CARD_DEVICE, slot);
fd = open(name, 0);
if (fd < 0)
return;

View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id$
* $Id: rdreg.c,v 1.4 1996/04/18 04:24:56 nate Exp $
*/
#include <stdio.h>
#include <stdlib.h>
@ -41,7 +41,7 @@ dumpslot(sl)
int fd;
struct pcic_reg r;
sprintf(name, "/dev/card%d", sl);
sprintf(name, CARD_DEVICE, sl);
fd = open(name, 2);
if (fd < 0) {
perror(name);

View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: wrattr.c,v 1.4 1996/04/18 04:24:57 nate Exp $
* $Id: wrattr.c,v 1.5 1996/04/18 05:23:47 nate Exp $
*/
#include <stdio.h>
#include <stdlib.h>
@ -48,7 +48,7 @@ wrattr_main(argc, argv)
fprintf(stderr, "usage: %s wrattr slot offs value\n", argv[0]);
exit(1);
}
sprintf(name, "/dev/card%d", atoi(argv[1]));
sprintf(name, CARD_DEVICE, atoi(argv[1]));
fd = open(name, 2);
if (fd < 0) {
perror(name);

View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id$
* $Id: wrreg.c,v 1.4 1996/04/18 04:24:58 nate Exp $
*/
#include <stdio.h>
#include <stdlib.h>
@ -48,7 +48,7 @@ wrreg_main(argc, argv)
fprintf(stderr, "usage: wrreg slot reg value\n");
exit(1);
}
sprintf(name, "/dev/card%d", atoi(argv[1]));
sprintf(name, CARD_DEVICE, atoi(argv[1]));
fd = open(name, 2);
if (fd < 0) {
perror(name);