summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2001-01-18 20:28:15 +0000
committerjdolecek <jdolecek@NetBSD.org>2001-01-18 20:28:15 +0000
commit34c8ae80dab7dff7ee69b219c6bf49ca6e84e73f (patch)
tree625354b477ae0db6bb663fa25ffc8be7214a49a0 /sys/dev/usb
parente912e655e179f7c8dd5317da1faff48b8b02cf8e (diff)
constify
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/devlist2h.awk4
-rw-r--r--sys/dev/usb/ezload.c8
-rw-r--r--sys/dev/usb/ezload.h6
-rw-r--r--sys/dev/usb/if_aue.c12
-rw-r--r--sys/dev/usb/if_kue.c14
-rw-r--r--sys/dev/usb/usb_quirks.c10
-rw-r--r--sys/dev/usb/usb_quirks.h6
-rw-r--r--sys/dev/usb/usb_subr.c6
-rw-r--r--sys/dev/usb/usbdevs_data.h4
-rw-r--r--sys/dev/usb/usbdi.h4
-rw-r--r--sys/dev/usb/usbdivar.h4
-rw-r--r--sys/dev/usb/uyap.c6
12 files changed, 42 insertions, 42 deletions
diff --git a/sys/dev/usb/devlist2h.awk b/sys/dev/usb/devlist2h.awk
index 49ef274e983..d2613f294a6 100644
--- a/sys/dev/usb/devlist2h.awk
+++ b/sys/dev/usb/devlist2h.awk
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: devlist2h.awk,v 1.8 1999/11/18 23:32:25 augustss Exp $
+# $NetBSD: devlist2h.awk,v 1.9 2001/01/18 20:28:22 jdolecek Exp $
#
# Copyright (c) 1995, 1996 Christopher G. Demetriou
# All rights reserved.
@@ -174,7 +174,7 @@ END {
printf("\n") > dfile
- printf("struct usb_knowndev usb_knowndevs[] = {\n") > dfile
+ printf("const struct usb_knowndev usb_knowndevs[] = {\n") > dfile
for (i = 1; i <= nproducts; i++) {
printf("\t{\n") > dfile
printf("\t USB_VENDOR_%s, USB_PRODUCT_%s_%s,\n",
diff --git a/sys/dev/usb/ezload.c b/sys/dev/usb/ezload.c
index fa321adcd56..cd528276dea 100644
--- a/sys/dev/usb/ezload.c
+++ b/sys/dev/usb/ezload.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ezload.c,v 1.1 2001/01/02 18:49:56 augustss Exp $ */
+/* $NetBSD: ezload.c,v 1.2 2001/01/18 20:28:23 jdolecek Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -106,10 +106,10 @@ ezload_reset(usbd_device_handle dev, int reset)
}
usbd_status
-ezload_download(usbd_device_handle dev, struct ezdata *rec)
+ezload_download(usbd_device_handle dev, const struct ezdata *rec)
{
usb_device_request_t req;
- struct ezdata *ptr;
+ const struct ezdata *ptr;
usbd_status err;
u_int len, offs;
@@ -145,7 +145,7 @@ ezload_download(usbd_device_handle dev, struct ezdata *rec)
}
usbd_status
-ezload_downloads_and_reset(usbd_device_handle dev, struct ezdata **recs)
+ezload_downloads_and_reset(usbd_device_handle dev, const struct ezdata **recs)
{
usbd_status err;
diff --git a/sys/dev/usb/ezload.h b/sys/dev/usb/ezload.h
index 48e772cbe29..ccd17e20873 100644
--- a/sys/dev/usb/ezload.h
+++ b/sys/dev/usb/ezload.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ezload.h,v 1.1 2001/01/02 22:24:00 augustss Exp $ */
+/* $NetBSD: ezload.h,v 1.2 2001/01/18 20:28:23 jdolecek Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,5 +43,5 @@ struct ezdata {
};
usbd_status ezload_reset(usbd_device_handle, int);
-usbd_status ezload_download(usbd_device_handle, struct ezdata *);
-usbd_status ezload_downloads_and_reset(usbd_device_handle, struct ezdata **);
+usbd_status ezload_download(usbd_device_handle, const struct ezdata *);
+usbd_status ezload_downloads_and_reset(usbd_device_handle, const struct ezdata **);
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index bc9ceeeda78..e4e4ce4971a 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.50 2000/12/14 07:51:36 thorpej Exp $ */
+/* $NetBSD: if_aue.c,v 1.51 2001/01/18 20:28:23 jdolecek Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -184,7 +184,7 @@ struct aue_type {
char aue_linksys;
};
-Static struct aue_type aue_devs[] = {
+Static const struct aue_type aue_devs[] = {
{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100, 0 },
{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1, 0 },
{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5, 0 },
@@ -204,7 +204,7 @@ Static struct aue_type aue_devs[] = {
USB_DECLARE_DRIVER(aue);
-Static struct aue_type *aue_lookup(u_int16_t vendor, u_int16_t product);
+Static const struct aue_type *aue_lookup(u_int16_t vendor, u_int16_t product);
Static int aue_tx_list_init(struct aue_softc *);
Static int aue_rx_list_init(struct aue_softc *);
Static int aue_newbuf(struct aue_softc *, struct aue_chain *, struct mbuf *);
@@ -254,7 +254,7 @@ Static void aue_rxstart(struct ifnet *);
Static struct usb_qdat aue_qdat;
-Static device_method_t aue_methods[] = {
+Static const device_method_t aue_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, aue_match),
DEVMETHOD(device_attach, aue_attach),
@@ -701,10 +701,10 @@ aue_reset(struct aue_softc *sc)
delay(10000); /* XXX */
}
-Static struct aue_type *
+Static const struct aue_type *
aue_lookup(u_int16_t vendor, u_int16_t product)
{
- struct aue_type *t;
+ const struct aue_type *t;
for (t = aue_devs; t->aue_vid != 0; t++)
if (vendor == t->aue_vid && product == t->aue_did)
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 5185c4bd144..e4f9606cd8d 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.34 2000/12/14 07:51:36 thorpej Exp $ */
+/* $NetBSD: if_kue.c,v 1.35 2001/01/18 20:28:23 jdolecek Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -172,7 +172,7 @@ int kuedebug = 0;
/*
* Various supported device vendors/products.
*/
-Static struct kue_type kue_devs[] = {
+Static const struct kue_type kue_devs[] = {
{ USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101 },
{ USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT },
{ USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T },
@@ -210,7 +210,7 @@ Static void kue_setmulti(struct kue_softc *);
Static void kue_reset(struct kue_softc *);
Static usbd_status kue_ctl(struct kue_softc *, int, u_int8_t,
- u_int16_t, void *, u_int32_t);
+ u_int16_t, const void *, u_int32_t);
Static usbd_status kue_setword(struct kue_softc *, u_int8_t, u_int16_t);
Static int kue_is_warm(struct kue_softc *);
Static int kue_load_fw(struct kue_softc *);
@@ -226,7 +226,7 @@ Static void kue_shutdown(device_t);
Static struct usb_qdat kue_qdat;
-Static device_method_t kue_methods[] = {
+Static const device_method_t kue_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, kue_match),
DEVMETHOD(device_attach, kue_attach),
@@ -275,7 +275,7 @@ kue_setword(struct kue_softc *sc, u_int8_t breq, u_int16_t word)
Static usbd_status
kue_ctl(struct kue_softc *sc, int rw, u_int8_t breq, u_int16_t val,
- void *data, u_int32_t len)
+ const void *data, u_int32_t len)
{
usb_device_request_t req;
usbd_status err;
@@ -295,7 +295,7 @@ kue_ctl(struct kue_softc *sc, int rw, u_int8_t breq, u_int16_t val,
USETW(req.wLength, len);
s = splusb();
- err = KUE_DO_REQUEST(sc->kue_udev, &req, data);
+ err = KUE_DO_REQUEST(sc->kue_udev, &req, (void *)data);
splx(s);
return (err);
@@ -499,7 +499,7 @@ kue_reset(struct kue_softc *sc)
USB_MATCH(kue)
{
USB_MATCH_START(kue, uaa);
- struct kue_type *t;
+ const struct kue_type *t;
DPRINTFN(25,("kue_match: enter\n"));
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index a0e5ccf158c..c6054f2666e 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.35 2001/01/11 20:35:02 explorer Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.36 2001/01/18 20:28:23 jdolecek Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.13 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -50,7 +50,7 @@
extern int usbdebug;
#endif
-Static struct usbd_quirk_entry {
+Static const struct usbd_quirk_entry {
u_int16_t idVendor;
u_int16_t idProduct;
u_int16_t bcdDevice;
@@ -82,12 +82,12 @@ Static struct usbd_quirk_entry {
{ 0, 0, 0, { 0 } }
};
-struct usbd_quirks usbd_no_quirk = { 0 };
+const struct usbd_quirks usbd_no_quirk = { 0 };
-struct usbd_quirks *
+const struct usbd_quirks *
usbd_find_quirk(usb_device_descriptor_t *d)
{
- struct usbd_quirk_entry *t;
+ const struct usbd_quirk_entry *t;
for (t = usb_quirks; t->idVendor != 0; t++) {
if (t->idVendor == UGETW(d->idVendor) &&
diff --git a/sys/dev/usb/usb_quirks.h b/sys/dev/usb/usb_quirks.h
index 6d16561a7cc..5ddcfc51024 100644
--- a/sys/dev/usb/usb_quirks.h
+++ b/sys/dev/usb/usb_quirks.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.h,v 1.18 2001/01/11 20:35:02 explorer Exp $ */
+/* $NetBSD: usb_quirks.h,v 1.19 2001/01/18 20:28:23 jdolecek Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.h,v 1.9 1999/11/12 23:31:03 n_hibma Exp $ */
/*
@@ -55,6 +55,6 @@ struct usbd_quirks {
#define UQ_ASSUME_CM_OVER_DATA 0x1000 /* modem device breaks on cm over data */
};
-extern struct usbd_quirks usbd_no_quirk;
+extern const struct usbd_quirks usbd_no_quirk;
-struct usbd_quirks *usbd_find_quirk(usb_device_descriptor_t *);
+const struct usbd_quirks *usbd_find_quirk(usb_device_descriptor_t *);
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index bdaaa6f2911..db063f0c3c4 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.83 2001/01/08 20:21:16 augustss Exp $ */
+/* $NetBSD: usb_subr.c,v 1.84 2001/01/18 20:28:22 jdolecek Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -111,7 +111,7 @@ struct usb_knowndev {
#include <dev/usb/usbdevs_data.h>
#endif /* USBVERBOSE */
-Static const char *usbd_error_strs[] = {
+Static const char * const usbd_error_strs[] = {
"NORMAL_COMPLETION",
"IN_PROGRESS",
"PENDING_REQUESTS",
@@ -227,7 +227,7 @@ usbd_devinfo_vp(usbd_device_handle dev, char *v, char *p, int usedev)
usb_device_descriptor_t *udd = &dev->ddesc;
char *vendor = 0, *product = 0;
#ifdef USBVERBOSE
- struct usb_knowndev *kdp;
+ const struct usb_knowndev *kdp;
#endif
if (dev == NULL) {
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 0c6f1247460..83143fcf236 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.141 2001/01/15 20:26:46 tshiozak Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.142 2001/01/18 20:28:22 jdolecek Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -44,7 +44,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-struct usb_knowndev usb_knowndevs[] = {
+const struct usb_knowndev usb_knowndevs[] = {
{
USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN,
0,
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 542faa06b39..e4884dc2d8a 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.h,v 1.45 2000/12/13 04:05:15 augustss Exp $ */
+/* $NetBSD: usbdi.h,v 1.46 2001/01/18 20:28:23 jdolecek Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -170,7 +170,7 @@ void usbd_add_dev_event(int, usbd_device_handle);
void usbd_add_drv_event(int, usbd_device_handle, device_ptr_t);
void usbd_devinfo(usbd_device_handle, int, char *);
-struct usbd_quirks *usbd_get_quirks(usbd_device_handle);
+const struct usbd_quirks *usbd_get_quirks(usbd_device_handle);
usb_endpoint_descriptor_t *usbd_get_endpoint_descriptor
(usbd_interface_handle iface, u_int8_t address);
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index b6ee5f360af..bcb7898944c 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.60 2000/12/28 10:40:36 augustss Exp $ */
+/* $NetBSD: usbdivar.h,v 1.61 2001/01/18 20:28:23 jdolecek Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */
/*
@@ -139,7 +139,7 @@ struct usbd_device {
struct usbd_interface *ifaces; /* array of all interfaces */
usb_device_descriptor_t ddesc; /* device descriptor */
usb_config_descriptor_t *cdesc; /* full config descr */
- struct usbd_quirks *quirks; /* device quirks, always set */
+ const struct usbd_quirks *quirks; /* device quirks, always set */
struct usbd_hub *hub; /* only if this is a hub */
device_ptr_t *subdevs; /* sub-devices, 0 terminated */
};
diff --git a/sys/dev/usb/uyap.c b/sys/dev/usb/uyap.c
index cec612d1c9a..205192524b0 100644
--- a/sys/dev/usb/uyap.c
+++ b/sys/dev/usb/uyap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uyap.c,v 1.2 2001/01/02 23:08:54 augustss Exp $ */
+/* $NetBSD: uyap.c,v 1.3 2001/01/18 20:28:23 jdolecek Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -49,10 +49,10 @@
#include <dev/usb/ezload.h>
-struct ezdata uyap_firmware[] = {
+const struct ezdata uyap_firmware[] = {
#include "dev/usb/uyap_firmware.h"
};
-struct ezdata *uyap_firmwares[] = { uyap_firmware, NULL };
+const struct ezdata *uyap_firmwares[] = { uyap_firmware, NULL };
struct uyap_softc {
USBBASEDEVICE sc_dev; /* base device */