Deleted Added
sdiff udiff text old ( 82415 ) new ( 82781 )
full compact
1/* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard.c 82415 2001-08-27 11:28:00Z jon $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard.c 82781 2001-09-02 06:37:41Z shiba $ */
3
4/*
5 * Copyright (c) 1997 Marc Horowitz. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:
10 * 1. Redistributions of source code must retain the above copyright

--- 27 unchanged lines hidden (view full) ---

38#include <sys/queue.h>
39#include <sys/types.h>
40
41#include <sys/bus.h>
42#include <machine/bus.h>
43#include <sys/rman.h>
44#include <machine/resource.h>
45
46#include <net/ethernet.h>
47
48#include <dev/pccard/pccardreg.h>
49#include <dev/pccard/pccardvar.h>
50
51#include "power_if.h"
52#include "card_if.h"
53
54#define PCCARDDEBUG
55

--- 333 unchanged lines hidden (view full) ---

389 resource_list_add(rl, SYS_RES_IOPORT, cfe->iorid[i],
390 rman_get_start(r), rman_get_end(r),
391 cfe->iospace[i].length);
392 rle = resource_list_find(rl, SYS_RES_IOPORT,
393 cfe->iorid[i]);
394 rle->res = r;
395 }
396 if (cfe->num_memspace > 0) {
395 goto not_this_one;
397 /*
398 * Not implement yet, Fix me.
399 */
400 }
401 if (cfe->irqmask) {
402 cfe->irqrid = 0;
403 r = cfe->irqres = bus_alloc_resource(bus, SYS_RES_IRQ,
404 &cfe->irqrid, 0, ~0, 1, 0);
405 if (cfe->irqres == NULL)
406 goto not_this_one;
407 resource_list_add(rl, SYS_RES_IRQ, cfe->irqrid,

--- 525 unchanged lines hidden (view full) ---

933 struct pccard_ivar *devi = PCCARD_IVAR(child);
934 struct pccard_function *func = devi->fcn;
935 struct pccard_softc *sc = PCCARD_SOFTC(bus);
936
937 /* PCCARD_IVAR_ETHADDR unhandled from oldcard */
938 switch (which) {
939 default:
940 case PCCARD_IVAR_ETHADDR:
937 return (ENOENT);
941 bcopy(func->pf_funce_lan_nid, result, ETHER_ADDR_LEN);
942 break;
943 case PCCARD_IVAR_VENDOR:
944 *(u_int32_t *) result = sc->card.manufacturer;
945 break;
946 case PCCARD_IVAR_PRODUCT:
947 *(u_int32_t *) result = sc->card.product;
948 break;
949 case PCCARD_IVAR_FUNCTION:

--- 285 unchanged lines hidden ---