Deleted Added
full compact
pccard_cis.c (150361) pccard_cis.c (161108)
1/* $NetBSD: pcmcia_cis.c,v 1.17 2000/02/10 09:01:52 chopps Exp $ */
1/* $NetBSD: pcmcia_cis.c,v 1.17 2000/02/10 09:01:52 chopps Exp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard_cis.c 150361 2005-09-20 06:45:38Z imp $ */
2/* $FreeBSD: head/sys/dev/pccard/pccard_cis.c 161108 2006-08-09 00:05:54Z 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

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

89 state.card->cis1_info[1] = NULL;
90 state.card->cis1_info[2] = NULL;
91 state.card->cis1_info[3] = NULL;
92 state.card->manufacturer = PCMCIA_VENDOR_INVALID;
93 state.card->product = PCMCIA_PRODUCT_INVALID;
94 STAILQ_INIT(&state.card->pf_head);
95 state.pf = NULL;
96
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

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

89 state.card->cis1_info[1] = NULL;
90 state.card->cis1_info[2] = NULL;
91 state.card->cis1_info[3] = NULL;
92 state.card->manufacturer = PCMCIA_VENDOR_INVALID;
93 state.card->product = PCMCIA_PRODUCT_INVALID;
94 STAILQ_INIT(&state.card->pf_head);
95 state.pf = NULL;
96
97 /*
98 * XXX The following shouldn't be needed, but some slow cards
99 * XXX seem to need it still. Need to investigate if there's
100 * XXX a way to tell if the card is 'ready' or not rather than
101 * XXX sleeping like this. We're called just after the power
102 * XXX up of the socket. The standard timing diagrams don't
103 * XXX seem to indicate that a delay is required. The old
104 * XXX delay was 1s. This delay is .1s.
105 */
106 tsleep(&state, 0, "pccard", hz / 10);
97 if (pccard_scan_cis(device_get_parent(sc->dev), sc->dev,
98 pccard_parse_cis_tuple, &state) == -1)
99 state.card->error++;
100}
101
102int
103pccard_scan_cis(device_t bus, device_t dev, pccard_scan_t fct, void *arg)
104{

--- 1208 unchanged lines hidden ---
107 if (pccard_scan_cis(device_get_parent(sc->dev), sc->dev,
108 pccard_parse_cis_tuple, &state) == -1)
109 state.card->error++;
110}
111
112int
113pccard_scan_cis(device_t bus, device_t dev, pccard_scan_t fct, void *arg)
114{

--- 1208 unchanged lines hidden ---