diff options
author | dillon <dillon@FreeBSD.org> | 1998-12-14 06:37:37 +0000 |
---|---|---|
committer | dillon <dillon@FreeBSD.org> | 1998-12-14 06:37:37 +0000 |
commit | 1b46557c21ab146b0e43c06a8e1e922202afd373 (patch) | |
tree | 1ec35db1a5a1d4721c6893b6be4dff54402005ea /sys/dev | |
parent | 2d9e52659ce15a8f818a51abfda4613167fdc974 (diff) | |
download | FreeBSD-src-1b46557c21ab146b0e43c06a8e1e922202afd373.zip FreeBSD-src-1b46557c21ab146b0e43c06a8e1e922202afd373.tar.gz |
probe function changed from returning char * to const char *.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/advansys/adv_pci.c | 6 | ||||
-rw-r--r-- | sys/dev/advansys/adw_pci.c | 6 | ||||
-rw-r--r-- | sys/dev/bktr/bktr_core.c | 6 | ||||
-rw-r--r-- | sys/dev/buslogic/bt_pci.c | 6 | ||||
-rw-r--r-- | sys/dev/cy/cy_pci.c | 6 | ||||
-rw-r--r-- | sys/dev/dpt/dpt_pci.c | 6 | ||||
-rw-r--r-- | sys/dev/en/if_en_pci.c | 4 | ||||
-rw-r--r-- | sys/dev/hea/eni.c | 8 | ||||
-rw-r--r-- | sys/dev/hfa/fore_load.c | 8 | ||||
-rw-r--r-- | sys/dev/isp/isp_pci.c | 4 | ||||
-rw-r--r-- | sys/dev/lnc/if_lnc_pci.c | 6 | ||||
-rw-r--r-- | sys/dev/pci/ohci_pci.c | 4 | ||||
-rw-r--r-- | sys/dev/pci/uhci_pci.c | 6 | ||||
-rw-r--r-- | sys/dev/pdq/if_fpa.c | 4 | ||||
-rw-r--r-- | sys/dev/sr/if_sr_pci.c | 6 | ||||
-rw-r--r-- | sys/dev/tx/if_tx.c | 6 | ||||
-rw-r--r-- | sys/dev/vr/if_vr.c | 8 |
17 files changed, 50 insertions, 50 deletions
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c index 593b305..f05c164 100644 --- a/sys/dev/advansys/adv_pci.c +++ b/sys/dev/advansys/adv_pci.c @@ -47,7 +47,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_pci.c,v 1.1 1998/09/15 07:03:43 gibbs Exp $ + * $Id: adv_pci.c,v 1.2 1998/12/07 21:58:45 archie Exp $ */ #include <pci.h> @@ -76,7 +76,7 @@ #define ADV_PCI_MAX_DMA_ADDR (0xFFFFFFFFL) #define ADV_PCI_MAX_DMA_COUNT (0xFFFFFFFFL) -static char* advpciprobe(pcici_t tag, pcidi_t type); +static const char* advpciprobe(pcici_t tag, pcidi_t type); static void advpciattach(pcici_t config_id, int unit); /* @@ -97,7 +97,7 @@ static struct pci_device adv_pci_driver = { DATA_SET (pcidevice_set, adv_pci_driver); -static char* +static const char* advpciprobe(pcici_t tag, pcidi_t type) { int rev = pci_conf_read(tag, PCI_CLASS_REG) & 0xff; diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c index eb941bf..b65037b 100644 --- a/sys/dev/advansys/adw_pci.c +++ b/sys/dev/advansys/adw_pci.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adw_pci.c,v 1.1 1998/10/07 03:20:49 gibbs Exp $ + * $Id: adw_pci.c,v 1.2 1998/12/07 21:58:45 archie Exp $ */ #include <pci.h> @@ -58,7 +58,7 @@ #define ADW_PCI_MAX_DMA_ADDR (0xFFFFFFFFUL) #define ADW_PCI_MAX_DMA_COUNT (0xFFFFFFFFUL) -static char* adwpciprobe(pcici_t tag, pcidi_t type); +static const char* adwpciprobe(pcici_t tag, pcidi_t type); static void adwpciattach(pcici_t config_id, int unit); static struct pci_device adw_pci_driver = { @@ -71,7 +71,7 @@ static struct pci_device adw_pci_driver = { DATA_SET (pcidevice_set, adw_pci_driver); -static char* +static const char* adwpciprobe(pcici_t tag, pcidi_t type) { switch (type) { diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index d4de62e..7ad1953 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $Id: brooktree848.c,v 1.59 1998/11/08 12:39:06 dfr Exp $ */ +/* $Id: brooktree848.c,v 1.60 1998/12/07 21:58:45 archie Exp $ */ /* BT848 Driver for Brooktree's Bt848 based cards. The Brooktree BT848 Driver driver is based upon Mark Tinguely and Jim Lowe's driver for the Matrox Meteor PCI card . The @@ -438,7 +438,7 @@ static bktr_reg_t brooktree[ NBKTR ]; #define MINOR(x) ((x >> 4) & 0x0f) #define ATTACH_ARGS pcici_t tag, int unit -static char* bktr_probe( pcici_t tag, pcidi_t type ); +static const char* bktr_probe( pcici_t tag, pcidi_t type ); static void bktr_attach( ATTACH_ARGS ); static u_long bktr_count; @@ -1127,7 +1127,7 @@ static int readEEProm( bktr_ptr_t bktr, int offset, int count, /* * the boot time probe routine. */ -static char* +static const char* bktr_probe( pcici_t tag, pcidi_t type ) { switch (type) { diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c index 435aff0..3c886d8 100644 --- a/sys/dev/buslogic/bt_pci.c +++ b/sys/dev/buslogic/bt_pci.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt_pci.c,v 1.2 1998/10/30 02:06:42 gibbs Exp $ + * $Id: bt_pci.c,v 1.3 1998/11/10 06:45:14 gibbs Exp $ */ #include "pci.h" @@ -53,7 +53,7 @@ static int btpcideterminebusspace(pcici_t config_id, bus_space_tag_t* tagp, bus_space_handle_t* bshp); -static char* bt_pci_probe(pcici_t tag, pcidi_t type); +static const char* bt_pci_probe(pcici_t tag, pcidi_t type); static void bt_pci_attach(pcici_t config_id, int unit); static struct pci_device bt_pci_driver = { @@ -98,7 +98,7 @@ btpcideterminebusspace(pcici_t config_id, bus_space_tag_t* tagp, return (0); } -static char* +static const char* bt_pci_probe (pcici_t config_id, pcidi_t type) { switch(type) { diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c index ae48965..a406308 100644 --- a/sys/dev/cy/cy_pci.c +++ b/sys/dev/cy/cy_pci.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cy_pci.c,v 1.5 1997/02/22 09:44:00 peter Exp $ + * $Id: cy_pci.c,v 1.6 1997/09/02 20:06:24 bde Exp $ */ /* @@ -44,7 +44,7 @@ #include <pci/cy_pcireg.h> -static char *cy_probe __P((pcici_t, pcidi_t)); +static const char *cy_probe __P((pcici_t, pcidi_t)); static void cy_attach __P((pcici_t, int)); extern int cyattach_common(void *, int); /* Not exactly correct */ @@ -61,7 +61,7 @@ static struct pci_device cy_device = { }; DATA_SET(pcidevice_set, cy_device); -static char * +static const char * cy_probe(config_id, device_id) pcici_t config_id; pcidi_t device_id; diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c index b704fca..7bf0e26 100644 --- a/sys/dev/dpt/dpt_pci.c +++ b/sys/dev/dpt/dpt_pci.c @@ -32,7 +32,7 @@ * dptpci.c: PCI Bus Attachment for DPT SCSI HBAs */ -#ident "$Id: dpt_pci.c,v 1.9 1998/10/07 03:40:51 gibbs Exp $" +#ident "$Id: dpt_pci.c,v 1.10 1998/12/07 21:58:46 archie Exp $" #include "opt_devfs.h" #include "opt_dpt.h" @@ -64,7 +64,7 @@ /* Function Prototypes */ -static char *dpt_pci_probe(pcici_t tag, pcidi_t type); +static const char *dpt_pci_probe(pcici_t tag, pcidi_t type); static void dpt_pci_attach(pcici_t config_id, int unit); extern struct cdevsw dpt_cdevsw; @@ -86,7 +86,7 @@ DATA_SET(pcidevice_set, dpt_pci_driver); * because we do not know for sure how the two relate. */ -static char * +static const char * dpt_pci_probe(pcici_t tag, pcidi_t type) { u_int32_t class; diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c index 37db78e..acc6f63 100644 --- a/sys/dev/en/if_en_pci.c +++ b/sys/dev/en/if_en_pci.c @@ -80,7 +80,7 @@ */ static void en_pci_attach __P((pcici_t, int)); -static char *en_pci_probe __P((pcici_t, pcidi_t)); +static const char *en_pci_probe __P((pcici_t, pcidi_t)); #ifdef SHUTDOWN_PRE_SYNC static void en_pci_shutdown __P((int, void *)); #else @@ -203,7 +203,7 @@ void *v; * autoconfig stuff */ -static char *en_pci_probe(config_id, device_id) +static const char *en_pci_probe(config_id, device_id) pcici_t config_id; pcidi_t device_id; diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c index c3e63b9a..8c3e060 100644 --- a/sys/dev/hea/eni.c +++ b/sys/dev/hea/eni.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: eni.c,v 1.3 1998/10/31 20:06:45 phk Exp $ + * @(#) $Id: eni.c,v 1.4 1998/12/04 22:54:45 archie Exp $ * */ @@ -42,13 +42,13 @@ #include <dev/hea/eni_var.h> #ifndef lint -__RCSID("@(#) $Id: eni.c,v 1.3 1998/10/31 20:06:45 phk Exp $"); +__RCSID("@(#) $Id: eni.c,v 1.4 1998/12/04 22:54:45 archie Exp $"); #endif /* * Typedef local functions */ -static char *eni_pci_probe __P((pcici_t, pcidi_t)); +static const char *eni_pci_probe __P((pcici_t, pcidi_t)); static void eni_pci_attach __P((pcici_t, int)); static int eni_get_ack __P((Eni_unit *)); static int eni_get_sebyte __P((Eni_unit *)); @@ -98,7 +98,7 @@ DATA_SET ( pcidevice_set, eni_pci_device ); * NULL unrecognized vendor/device * */ -static char * +static const char * eni_pci_probe ( pcici_t config_id, pcidi_t device_id ) { diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c index 96c59be..e41370e 100644 --- a/sys/dev/hfa/fore_load.c +++ b/sys/dev/hfa/fore_load.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: fore_load.c,v 1.3 1998/10/31 20:06:53 phk Exp $ + * @(#) $Id: fore_load.c,v 1.4 1998/12/04 22:54:45 archie Exp $ * */ @@ -38,7 +38,7 @@ #include <dev/hfa/fore_include.h> #ifndef lint -__RCSID("@(#) $Id: fore_load.c,v 1.3 1998/10/31 20:06:53 phk Exp $"); +__RCSID("@(#) $Id: fore_load.c,v 1.4 1998/12/04 22:54:45 archie Exp $"); #endif @@ -54,7 +54,7 @@ static int fore_identify __P((char *)); static int fore_attach __P((struct devinfo *)); #endif #ifdef __FreeBSD__ -static char * fore_pci_probe __P((pcici_t, pcidi_t)); +static const char * fore_pci_probe __P((pcici_t, pcidi_t)); static void fore_pci_attach __P((pcici_t, int)); #if BSD < 199506 static int fore_pci_shutdown __P((struct kern_devconf *, int)); @@ -844,7 +844,7 @@ fore_attach(devinfo_p) * NULL device not claimed by this driver * */ -static char * +static const char * fore_pci_probe(config_id, device_id) pcici_t config_id; pcidi_t device_id; diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 8619d49..43dad60 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -129,7 +129,7 @@ static struct ispmdvec mdvec_2100 = { #define MEM_MAP_REG 0x14 -static char *isp_pci_probe __P((pcici_t tag, pcidi_t type)); +static const char *isp_pci_probe __P((pcici_t tag, pcidi_t type)); static void isp_pci_attach __P((pcici_t config_d, int unit)); /* This distinguishing define is not right, but it does work */ @@ -196,7 +196,7 @@ struct pci_device isp_pci_driver = { DATA_SET (pcidevice_set, isp_pci_driver); -static char * +static const char * isp_pci_probe(tag, type) pcici_t tag; pcidi_t type; diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c index 3cffcab..27f2048 100644 --- a/sys/dev/lnc/if_lnc_pci.c +++ b/sys/dev/lnc/if_lnc_pci.c @@ -17,7 +17,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: if_lnc_p.c,v 1.5 1997/08/02 14:33:11 bde Exp $ + * $Id: if_lnc_p.c,v 1.6 1998/07/20 17:33:01 msmith Exp $ */ #include "pci.h" @@ -36,7 +36,7 @@ extern void *lnc_attach_ne2100_pci __P((int unit, unsigned iobase)); -static char* lnc_pci_probe __P((pcici_t tag, pcidi_t type)); +static const char* lnc_pci_probe __P((pcici_t tag, pcidi_t type)); static void lnc_pci_attach __P((pcici_t config_id, int unit)); static u_long lnc_pci_count = NLNC; @@ -51,7 +51,7 @@ static struct pci_device lnc_pci_driver = { DATA_SET (pcidevice_set, lnc_pci_driver); -static char* +static const char* lnc_pci_probe (pcici_t tag, pcidi_t type) { switch(type) { diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c index 76d5be4..0648746 100644 --- a/sys/dev/pci/ohci_pci.c +++ b/sys/dev/pci/ohci_pci.c @@ -99,7 +99,7 @@ struct cfattach ohci_pci_ca = { #define PCI_OHCI_BASE_REG 0x10 -static char *ohci_pci_probe __P((pcici_t, pcidi_t)); +static const char *ohci_pci_probe __P((pcici_t, pcidi_t)); static void ohci_pci_attach __P((pcici_t, int)); u_long ohci_count = 0; /* global counter for nr. of devices found */ @@ -132,7 +132,7 @@ ohci_pci_match(parent, match, aux) return 0; } #elif defined(__FreeBSD__) -static char * +static const char * ohci_pci_probe(pcici_t config_id, pcidi_t device_id) { u_int32_t class; diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c index cfca628..f17b9af 100644 --- a/sys/dev/pci/uhci_pci.c +++ b/sys/dev/pci/uhci_pci.c @@ -94,8 +94,8 @@ struct cfattach uhci_pci_ca = { #define PCI_UHCI_BASE_REG 0x20 -static char *uhci_pci_probe __P((pcici_t, pcidi_t)); -static void uhci_pci_attach __P((pcici_t, int)); +static const char *uhci_pci_probe __P((pcici_t, pcidi_t)); +static void uhci_pci_attach __P((pcici_t, int)); u_long uhci_count = 0; /* global counter for nr. of devices found */ @@ -129,7 +129,7 @@ uhci_pci_match(parent, match, aux) } #elif defined(__FreeBSD__) -static char * +static const char * uhci_pci_probe(pcici_t config_id, pcidi_t device_id) { u_int32_t class; diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c index 8706f2a..cff0be2 100644 --- a/sys/dev/pdq/if_fpa.c +++ b/sys/dev/pdq/if_fpa.c @@ -21,7 +21,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: if_fpa.c,v 1.6 1998/02/09 06:10:49 eivind Exp $ + * $Id: if_fpa.c,v 1.7 1998/02/20 13:11:53 bde Exp $ * */ @@ -135,7 +135,7 @@ static void pdq_pci_shutdown(int, void *); * on both EISA and PCI boards, one must be careful in how defines the * PDQ in the config file. */ -static char * +static const char * pdq_pci_probe( pcici_t config_id, pcidi_t device_id) diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c index 02a32e0..41a5ec3 100644 --- a/sys/dev/sr/if_sr_pci.c +++ b/sys/dev/sr/if_sr_pci.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_sr_p.c,v 1.5 1997/09/02 20:06:27 bde Exp $ + * $Id: if_sr_p.c,v 1.6 1998/02/09 06:10:52 eivind Exp $ */ #include "pci.h" @@ -54,7 +54,7 @@ extern void *srattach_pci(int unit, vm_offset_t sca_vaddr); extern void srintr_hc(void *hc); -static char *sr_pci_probe(pcici_t tag, pcidi_t type); +static const char *sr_pci_probe(pcici_t tag, pcidi_t type); static void sr_pci_attach(pcici_t config_id, int unit); static u_long src_count = NSR; @@ -69,7 +69,7 @@ static struct pci_device sr_pci_driver = DATA_SET (pcidevice_set, sr_pci_driver); -static char * +static const char * sr_pci_probe(pcici_t tag, pcidi_t type) { switch(type) { diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index 639a4256..a79ebeb 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -1,5 +1,5 @@ /* $OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */ -/* $Id: if_tx.c,v 1.18 1998/12/07 21:58:46 archie Exp $ */ +/* $Id: if_tx.c,v 1.19 1998/12/09 01:12:18 eivind Exp $ */ /*- * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru) @@ -360,7 +360,7 @@ epic_shutdown( #else /* __FreeBSD__ */ /* -----------------------------FreeBSD------------------------------------- */ -static char* epic_freebsd_probe __P((pcici_t, pcidi_t)); +static const char* epic_freebsd_probe __P((pcici_t, pcidi_t)); static void epic_freebsd_attach __P((pcici_t, int)); static void epic_shutdown __P((int, void *)); @@ -377,7 +377,7 @@ static struct pci_device txdevice = { DATA_SET ( pcidevice_set, txdevice ); /* Synopsis: Check if device id corresponds with SMC83C170 id. */ -static char* +static const char* epic_freebsd_probe( pcici_t config_id, pcidi_t device_id) diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c index e0b377f..07890f8 100644 --- a/sys/dev/vr/if_vr.c +++ b/sys/dev/vr/if_vr.c @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $ + * $Id: if_vr.c,v 1.3 1998/12/07 21:58:47 archie Exp $ */ /* @@ -97,7 +97,7 @@ #ifndef lint static const char rcsid[] = - "$Id: if_vr.c,v 1.2 1998/12/05 02:21:44 wpaul Exp $"; + "$Id: if_vr.c,v 1.3 1998/12/07 21:58:47 archie Exp $"; #endif /* @@ -128,7 +128,7 @@ static struct vr_type vr_phys[] = { }; static unsigned long vr_count = 0; -static char *vr_probe __P((pcici_t, pcidi_t)); +static const char *vr_probe __P((pcici_t, pcidi_t)); static void vr_attach __P((pcici_t, int)); static int vr_newbuf __P((struct vr_softc *, @@ -865,7 +865,7 @@ static void vr_reset(sc) * Probe for a VIA Rhine chip. Check the PCI vendor and device * IDs against our list and return a device name if we find a match. */ -static char * +static const char * vr_probe(config_id, device_id) pcici_t config_id; pcidi_t device_id; |