Deleted Added
sdiff udiff text old ( 103171 ) new ( 104610 )
full compact
pccard.c (103171) pccard.c (104610)
1/* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */
1/* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard.c 103171 2002-09-10 06:32:18Z imp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard.c 104610 2002-10-07 07:18:32Z imp $ */
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

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

920
921static int
922pccard_read_ivar(device_t bus, device_t child, int which, u_char *result)
923{
924 struct pccard_ivar *devi = PCCARD_IVAR(child);
925 struct pccard_function *func = devi->fcn;
926 struct pccard_softc *sc = PCCARD_SOFTC(bus);
927
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

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

920
921static int
922pccard_read_ivar(device_t bus, device_t child, int which, u_char *result)
923{
924 struct pccard_ivar *devi = PCCARD_IVAR(child);
925 struct pccard_function *func = devi->fcn;
926 struct pccard_softc *sc = PCCARD_SOFTC(bus);
927
928 /* PCCARD_IVAR_ETHADDR unhandled from oldcard */
929 switch (which) {
930 default:
931 case PCCARD_IVAR_ETHADDR:
932 bcopy(func->pf_funce_lan_nid, result, ETHER_ADDR_LEN);
933 break;
934 case PCCARD_IVAR_VENDOR:
935 *(u_int32_t *) result = sc->card.manufacturer;
936 break;

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

955 break;
956 case PCCARD_IVAR_PRODUCT_STR:
957 *(char **) result = sc->card.cis1_info[1];
958 break;
959 case PCCARD_IVAR_CIS3_STR:
960 *(char **) result = sc->card.cis1_info[2];
961 break;
962 case PCCARD_IVAR_CIS4_STR:
928 switch (which) {
929 default:
930 case PCCARD_IVAR_ETHADDR:
931 bcopy(func->pf_funce_lan_nid, result, ETHER_ADDR_LEN);
932 break;
933 case PCCARD_IVAR_VENDOR:
934 *(u_int32_t *) result = sc->card.manufacturer;
935 break;

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

954 break;
955 case PCCARD_IVAR_PRODUCT_STR:
956 *(char **) result = sc->card.cis1_info[1];
957 break;
958 case PCCARD_IVAR_CIS3_STR:
959 *(char **) result = sc->card.cis1_info[2];
960 break;
961 case PCCARD_IVAR_CIS4_STR:
963 *(char **) result = sc->card.cis1_info[2];
962 *(char **) result = sc->card.cis1_info[3];
964 break;
965 }
966 return (0);
967}
968
969static void
970pccard_driver_added(device_t dev, driver_t *driver)
971{

--- 263 unchanged lines hidden --- 		963 break;
964 }
965 return (0);
966}
967
968static void
969pccard_driver_added(device_t dev, driver_t *driver)
970{

--- 263 unchanged lines hidden ---