s/logprintf/printf/g

Approved by: re@
This commit is contained in:
imp 2007-06-20 05:11:37 +00:00
parent eedfe26628
commit 84d4dbb618
33 changed files with 90 additions and 90 deletions

View File

@ -118,8 +118,8 @@ __KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $");
#endif
/* #define UAUDIO_MULTIPLE_ENDPOINTS */
#ifdef USB_DEBUG
#define DPRINTF(x) do { if (uaudiodebug) logprintf x; } while (0)
#define DPRINTFN(n,x) do { if (uaudiodebug>(n)) logprintf x; } while (0)
#define DPRINTF(x) do { if (uaudiodebug) printf x; } while (0)
#define DPRINTFN(n,x) do { if (uaudiodebug>(n)) printf x; } while (0)
int uaudiodebug = 0;
#if defined(__FreeBSD__)
SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio");
@ -914,17 +914,17 @@ uaudio_dump_cluster(const struct usb_audio_cluster *cl)
int cc, i, first;
cc = UGETW(cl->wChannelConfig);
logprintf("cluster: bNrChannels=%u wChannelConfig=0x%.4x",
printf("cluster: bNrChannels=%u wChannelConfig=0x%.4x",
cl->bNrChannels, cc);
first = TRUE;
for (i = 0; cc != 0; i++) {
if (cc & 1) {
logprintf("%c%s", first ? '<' : ',', channel_names[i]);
printf("%c%s", first ? '<' : ',', channel_names[i]);
first = FALSE;
}
cc = cc >> 1;
}
logprintf("> iChannelNames=%u", cl->iChannelNames);
printf("> iChannelNames=%u", cl->iChannelNames);
}
#endif
@ -2354,79 +2354,79 @@ uaudio_identify_ac(struct uaudio_softc *sc, const usb_config_descriptor_t *cdesc
if (iot[i].d.desc == NULL)
continue;
logprintf("id %d:\t", i);
printf("id %d:\t", i);
switch (iot[i].d.desc->bDescriptorSubtype) {
case UDESCSUB_AC_INPUT:
logprintf("AC_INPUT type=%s\n", uaudio_get_terminal_name
printf("AC_INPUT type=%s\n", uaudio_get_terminal_name
(UGETW(iot[i].d.it->wTerminalType)));
logprintf("\t");
printf("\t");
cluster = uaudio_get_cluster(i, iot);
uaudio_dump_cluster(&cluster);
logprintf("\n");
printf("\n");
break;
case UDESCSUB_AC_OUTPUT:
logprintf("AC_OUTPUT type=%s ", uaudio_get_terminal_name
printf("AC_OUTPUT type=%s ", uaudio_get_terminal_name
(UGETW(iot[i].d.ot->wTerminalType)));
logprintf("src=%d\n", iot[i].d.ot->bSourceId);
printf("src=%d\n", iot[i].d.ot->bSourceId);
break;
case UDESCSUB_AC_MIXER:
logprintf("AC_MIXER src=");
printf("AC_MIXER src=");
for (j = 0; j < iot[i].d.mu->bNrInPins; j++)
logprintf("%d ", iot[i].d.mu->baSourceId[j]);
logprintf("\n\t");
printf("%d ", iot[i].d.mu->baSourceId[j]);
printf("\n\t");
cluster = uaudio_get_cluster(i, iot);
uaudio_dump_cluster(&cluster);
logprintf("\n");
printf("\n");
break;
case UDESCSUB_AC_SELECTOR:
logprintf("AC_SELECTOR src=");
printf("AC_SELECTOR src=");
for (j = 0; j < iot[i].d.su->bNrInPins; j++)
logprintf("%d ", iot[i].d.su->baSourceId[j]);
logprintf("\n");
printf("%d ", iot[i].d.su->baSourceId[j]);
printf("\n");
break;
case UDESCSUB_AC_FEATURE:
logprintf("AC_FEATURE src=%d\n", iot[i].d.fu->bSourceId);
printf("AC_FEATURE src=%d\n", iot[i].d.fu->bSourceId);
break;
case UDESCSUB_AC_PROCESSING:
logprintf("AC_PROCESSING src=");
printf("AC_PROCESSING src=");
for (j = 0; j < iot[i].d.pu->bNrInPins; j++)
logprintf("%d ", iot[i].d.pu->baSourceId[j]);
logprintf("\n\t");
printf("%d ", iot[i].d.pu->baSourceId[j]);
printf("\n\t");
cluster = uaudio_get_cluster(i, iot);
uaudio_dump_cluster(&cluster);
logprintf("\n");
printf("\n");
break;
case UDESCSUB_AC_EXTENSION:
logprintf("AC_EXTENSION src=");
printf("AC_EXTENSION src=");
for (j = 0; j < iot[i].d.eu->bNrInPins; j++)
logprintf("%d ", iot[i].d.eu->baSourceId[j]);
logprintf("\n\t");
printf("%d ", iot[i].d.eu->baSourceId[j]);
printf("\n\t");
cluster = uaudio_get_cluster(i, iot);
uaudio_dump_cluster(&cluster);
logprintf("\n");
printf("\n");
break;
default:
logprintf("unknown audio control (subtype=%d)\n",
printf("unknown audio control (subtype=%d)\n",
iot[i].d.desc->bDescriptorSubtype);
}
for (j = 0; j < iot[i].inputs_size; j++) {
int k;
logprintf("\tinput%d: ", j);
printf("\tinput%d: ", j);
tml = iot[i].inputs[j];
if (tml == NULL) {
logprintf("NULL\n");
printf("NULL\n");
continue;
}
for (k = 0; k < tml->size; k++)
logprintf("%s ", uaudio_get_terminal_name
printf("%s ", uaudio_get_terminal_name
(tml->terminals[k]));
logprintf("\n");
printf("\n");
}
logprintf("\toutput: ");
printf("\toutput: ");
tml = iot[i].output;
for (j = 0; j < tml->size; j++)
logprintf("%s ", uaudio_get_terminal_name(tml->terminals[j]));
logprintf("\n");
printf("%s ", uaudio_get_terminal_name(tml->terminals[j]));
printf("\n");
}
#endif

View File

@ -92,8 +92,8 @@ __FBSDID("$FreeBSD$");
#ifdef USB_DEBUG
#define EHCI_DEBUG USB_DEBUG
#define DPRINTF(x) do { if (ehcidebug) logprintf x; } while (0)
#define DPRINTFN(n,x) do { if (ehcidebug>(n)) logprintf x; } while (0)
#define DPRINTF(x) do { if (ehcidebug) printf x; } while (0)
#define DPRINTFN(n,x) do { if (ehcidebug>(n)) printf x; } while (0)
int ehcidebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci");
SYSCTL_INT(_hw_usb_ehci, OID_AUTO, debug, CTLFLAG_RW,

View File

@ -147,7 +147,7 @@ static const char *ehci_device_generic = "EHCI (generic) USB 2.0 controller";
#ifdef USB_DEBUG
#define EHCI_DEBUG USB_DEBUG
#define DPRINTF(x) do { if (ehcidebug) logprintf x; } while (0)
#define DPRINTF(x) do { if (ehcidebug) printf x; } while (0)
extern int ehcidebug;
#else
#define DPRINTF(x)

View File

@ -50,8 +50,8 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/hid.h>
#ifdef USB_DEBUG
#define DPRINTF(x) if (usbdebug) logprintf x
#define DPRINTFN(n,x) if (usbdebug>(n)) logprintf x
#define DPRINTF(x) if (usbdebug) printf x
#define DPRINTFN(n,x) if (usbdebug>(n)) printf x
extern int usbdebug;
#else
#define DPRINTF(x)

View File

@ -110,7 +110,7 @@ SYSCTL_INT(_hw_usb_rue, OID_AUTO, debug, CTLFLAG_RW,
#define DPRINTFN(n, x) do { \
if (ruedebug > (n)) \
logprintf x; \
printf x; \
} while (0);
#else
#define DPRINTFN(n, x)

View File

@ -64,8 +64,8 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/rt2573_ucode.h>
#ifdef USB_DEBUG
#define DPRINTF(x) do { if (rumdebug > 0) logprintf x; } while (0)
#define DPRINTFN(n, x) do { if (rumdebug >= (n)) logprintf x; } while (0)
#define DPRINTF(x) do { if (rumdebug > 0) printf x; } while (0)
#define DPRINTFN(n, x) do { if (rumdebug >= (n)) printf x; } while (0)
int rumdebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, rum, CTLFLAG_RW, 0, "USB rum");
SYSCTL_INT(_hw_usb_rum, OID_AUTO, debug, CTLFLAG_RW, &rumdebug, 0,

View File

@ -235,8 +235,8 @@ DRIVER_MODULE(miibus, udav, miibus_driver, miibus_devclass, 0, 0);
/* Macros */
#ifdef UDAV_DEBUG
#define DPRINTF(x) if (udavdebug) logprintf x
#define DPRINTFN(n,x) if (udavdebug >= (n)) logprintf x
#define DPRINTF(x) if (udavdebug) printf x
#define DPRINTFN(n,x) if (udavdebug >= (n)) printf x
int udavdebug = 0;
#else
#define DPRINTF(x)

View File

@ -63,8 +63,8 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/if_uralvar.h>
#ifdef USB_DEBUG
#define DPRINTF(x) do { if (uraldebug > 0) logprintf x; } while (0)
#define DPRINTFN(n, x) do { if (uraldebug >= (n)) logprintf x; } while (0)
#define DPRINTF(x) do { if (uraldebug > 0) printf x; } while (0)
#define DPRINTFN(n, x) do { if (uraldebug >= (n)) printf x; } while (0)
int uraldebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, ural, CTLFLAG_RW, 0, "USB ural");
SYSCTL_INT(_hw_usb_ural, OID_AUTO, debug, CTLFLAG_RW, &uraldebug, 0,

View File

@ -88,8 +88,8 @@ __FBSDID("$FreeBSD$");
#define delay(d) DELAY(d)
#ifdef USB_DEBUG
#define DPRINTF(x) if (ohcidebug) logprintf x
#define DPRINTFN(n,x) if (ohcidebug>(n)) logprintf x
#define DPRINTF(x) if (ohcidebug) printf x
#define DPRINTFN(n,x) if (ohcidebug>(n)) printf x
int ohcidebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci");
SYSCTL_INT(_hw_usb_ohci, OID_AUTO, debug, CTLFLAG_RW,

View File

@ -42,7 +42,7 @@
#ifdef UARK_DEBUG
#define DPRINTFN(n, x) do { \
if (uarkdebug > (n)) \
logprintf x; \
printf x; \
} while (0)
int uarkebug = 0;
#else

View File

@ -97,7 +97,7 @@ SYSCTL_INT(_hw_usb_ubsa, OID_AUTO, debug, CTLFLAG_RW,
#define DPRINTFN(n, x) do { \
if (ubsadebug > (n)) \
logprintf x; \
printf x; \
} while (0)
#else
#define DPRINTFN(n, x)

View File

@ -112,12 +112,12 @@ SYSCTL_INT(_hw_usb_ubser, OID_AUTO, debug, CTLFLAG_RW,
&ubserdebug, 0, "ubser debug level");
#define DPRINTF(x) do { \
if (ubserdebug) \
logprintf x; \
printf x; \
} while (0)
#define DPRINTFN(n, x) do { \
if (ubserdebug > (n)) \
logprintf x; \
printf x; \
} while (0)
#else
#define DPRINTF(x)

View File

@ -101,12 +101,12 @@ SYSCTL_INT(_hw_usb_ucom, OID_AUTO, debug, CTLFLAG_RW,
&ucomdebug, 0, "ucom debug level");
#define DPRINTF(x) do { \
if (ucomdebug) \
logprintf x; \
printf x; \
} while (0)
#define DPRINTFN(n, x) do { \
if (ucomdebug > (n)) \
logprintf x; \
printf x; \
} while (0)
#else
#define DPRINTF(x)

View File

@ -104,8 +104,8 @@ __FBSDID("$FreeBSD$");
#include <netgraph/netgraph.h>
#ifdef USB_DEBUG
#define DPRINTF(x) if (udbpdebug) logprintf x
#define DPRINTFN(n,x) if (udbpdebug>(n)) logprintf x
#define DPRINTF(x) if (udbpdebug) printf x
#define DPRINTFN(n,x) if (udbpdebug>(n)) printf x
int udbpdebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, udbp, CTLFLAG_RW, 0, "USB udbp");
SYSCTL_INT(_hw_usb_udbp, OID_AUTO, debug, CTLFLAG_RW,

View File

@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/dsbr100io.h>
#ifdef USB_DEBUG
#define DPRINTF(x) if (ufmdebug) logprintf x
#define DPRINTFN(n,x) if (ufmdebug>(n)) logprintf x
#define DPRINTF(x) if (ufmdebug) printf x
#define DPRINTFN(n,x) if (ufmdebug>(n)) printf x
int ufmdebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, ufm, CTLFLAG_RW, 0, "USB ufm");
SYSCTL_INT(_hw_usb_ufm, OID_AUTO, debug, CTLFLAG_RW,

View File

@ -79,12 +79,12 @@ SYSCTL_INT(_hw_usb_uftdi, OID_AUTO, debug, CTLFLAG_RW,
&uftdidebug, 0, "uftdi debug level");
#define DPRINTF(x) do { \
if (uftdidebug) \
logprintf x; \
printf x; \
} while (0)
#define DPRINTFN(n, x) do { \
if (uftdidebug > (n)) \
logprintf x; \
printf x; \
} while (0)
#else

View File

@ -90,8 +90,8 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_quirks.h>
#ifdef USB_DEBUG
#define DPRINTF(x) if (uhiddebug) logprintf x
#define DPRINTFN(n,x) if (uhiddebug>(n)) logprintf x
#define DPRINTF(x) if (uhiddebug) printf x
#define DPRINTFN(n,x) if (uhiddebug>(n)) printf x
int uhiddebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid");
SYSCTL_INT(_hw_usb_uhid, OID_AUTO, debug, CTLFLAG_RW,

View File

@ -77,8 +77,8 @@ __FBSDID("$FreeBSD$");
#define delay(d) DELAY(d)
#ifdef USB_DEBUG
#define DPRINTF(x) if (ukbddebug) logprintf x
#define DPRINTFN(n,x) if (ukbddebug>(n)) logprintf x
#define DPRINTF(x) if (ukbddebug) printf x
#define DPRINTFN(n,x) if (ukbddebug>(n)) printf x
int ukbddebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, ukbd, CTLFLAG_RW, 0, "USB ukbd");
SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, debug, CTLFLAG_RW,

View File

@ -75,8 +75,8 @@ __FBSDID("$FreeBSD$");
#define ULPT_READ_TIMO 10
#ifdef USB_DEBUG
#define DPRINTF(x) if (ulptdebug) logprintf x
#define DPRINTFN(n,x) if (ulptdebug>(n)) logprintf x
#define DPRINTF(x) if (ulptdebug) printf x
#define DPRINTFN(n,x) if (ulptdebug>(n)) printf x
int ulptdebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, ulpt, CTLFLAG_RW, 0, "USB ulpt");
SYSCTL_INT(_hw_usb_ulpt, OID_AUTO, debug, CTLFLAG_RW,

View File

@ -132,7 +132,7 @@
#ifdef USB_DEBUG
#define DIF(m, x) if (umassdebug & (m)) do { x ; } while (0)
#define DPRINTF(m, x) if (umassdebug & (m)) logprintf x
#define DPRINTF(m, x) if (umassdebug & (m)) printf x
#define UDMASS_GEN 0x00010000 /* general */
#define UDMASS_SCSI 0x00020000 /* scsi */
#define UDMASS_UFI 0x00040000 /* ufi command set */

View File

@ -112,7 +112,7 @@ int umodemdebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, umodem, CTLFLAG_RW, 0, "USB umodem");
SYSCTL_INT(_hw_usb_umodem, OID_AUTO, debug, CTLFLAG_RW,
&umodemdebug, 0, "umodem debug level");
#define DPRINTFN(n, x) if (umodemdebug > (n)) logprintf x
#define DPRINTFN(n, x) if (umodemdebug > (n)) printf x
#else
#define DPRINTFN(n, x)
#endif

View File

@ -71,8 +71,8 @@ __FBSDID("$FreeBSD$");
#include <sys/mouse.h>
#ifdef USB_DEBUG
#define DPRINTF(x) if (umsdebug) logprintf x
#define DPRINTFN(n,x) if (umsdebug>(n)) logprintf x
#define DPRINTF(x) if (umsdebug) printf x
#define DPRINTFN(n,x) if (umsdebug>(n)) printf x
int umsdebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums");
SYSCTL_INT(_hw_usb_ums, OID_AUTO, debug, CTLFLAG_RW,

View File

@ -126,7 +126,7 @@ SYSCTL_INT(_hw_usb_uplcom, OID_AUTO, debug, CTLFLAG_RW,
#define DPRINTFN(n, x) do { \
if (uplcomdebug > (n)) \
logprintf x; \
printf x; \
} while (0)
#else
#define DPRINTFN(n, x)

View File

@ -71,8 +71,8 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/rio500_usb.h>
#ifdef USB_DEBUG
#define DPRINTF(x) if (uriodebug) logprintf x
#define DPRINTFN(n,x) if (uriodebug>(n)) logprintf x
#define DPRINTF(x) if (uriodebug) printf x
#define DPRINTFN(n,x) if (uriodebug>(n)) printf x
int uriodebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, urio, CTLFLAG_RW, 0, "USB urio");
SYSCTL_INT(_hw_usb_urio, OID_AUTO, debug, CTLFLAG_RW,

View File

@ -98,8 +98,8 @@ MALLOC_DEFINE(M_USBHC, "USBHC", "USB host controller");
SYSCTL_NODE(_hw, OID_AUTO, usb, CTLFLAG_RW, 0, "USB debugging");
#ifdef USB_DEBUG
#define DPRINTF(x) if (usbdebug) logprintf x
#define DPRINTFN(n,x) if (usbdebug>(n)) logprintf x
#define DPRINTF(x) if (usbdebug) printf x
#define DPRINTFN(n,x) if (usbdebug>(n)) printf x
int usbdebug = 0;
SYSCTL_INT(_hw_usb, OID_AUTO, debug, CTLFLAG_RW,
&usbdebug, 0, "usb debug level");

View File

@ -70,8 +70,8 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_mem.h>
#ifdef USB_DEBUG
#define DPRINTF(x) if (usbdebug) logprintf x
#define DPRINTFN(n,x) if (usbdebug>(n)) logprintf x
#define DPRINTF(x) if (usbdebug) printf x
#define DPRINTFN(n,x) if (usbdebug>(n)) printf x
extern int usbdebug;
#else
#define DPRINTF(x)

View File

@ -128,8 +128,8 @@ __CONCAT(dname,_detach)(device_t self)
#include <sys/syslog.h>
/*
#define logprintf(args...) log(LOG_DEBUG, args)
#define printf(args...) log(LOG_DEBUG, args)
*/
#define logprintf printf
#define printf printf
#endif /* _USB_PORT_H */

View File

@ -154,7 +154,7 @@ usbd_find_quirk(usb_device_descriptor_t *d)
}
#ifdef USB_DEBUG
if (usbdebug && t->quirks.uq_flags)
logprintf("usbd_find_quirk 0x%04x/0x%04x/%x: %d\n",
printf("usbd_find_quirk 0x%04x/0x%04x/%x: %d\n",
UGETW(d->idVendor), UGETW(d->idProduct),
UGETW(d->bcdDevice), t->quirks.uq_flags);
#endif

View File

@ -74,8 +74,8 @@ __FBSDID("$FreeBSD$");
#define delay(d) DELAY(d)
#ifdef USB_DEBUG
#define DPRINTF(x) if (usbdebug) logprintf x
#define DPRINTFN(n,x) if (usbdebug>(n)) logprintf x
#define DPRINTF(x) if (usbdebug) printf x
#define DPRINTFN(n,x) if (usbdebug>(n)) printf x
extern int usbdebug;
#else
#define DPRINTF(x)

View File

@ -64,8 +64,8 @@ __FBSDID("$FreeBSD$");
#define delay(d) DELAY(d)
#ifdef USB_DEBUG
#define DPRINTF(x) if (usbdebug) logprintf x
#define DPRINTFN(n,x) if (usbdebug>(n)) logprintf x
#define DPRINTF(x) if (usbdebug) printf x
#define DPRINTFN(n,x) if (usbdebug>(n)) printf x
extern int usbdebug;
#else
#define DPRINTF(x)

View File

@ -54,8 +54,8 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usbdi_util.h>
#ifdef USB_DEBUG
#define DPRINTF(x) if (usbdebug) logprintf x
#define DPRINTFN(n,x) if (usbdebug>(n)) logprintf x
#define DPRINTF(x) if (usbdebug) printf x
#define DPRINTFN(n,x) if (usbdebug>(n)) printf x
extern int usbdebug;
#else
#define DPRINTF(x)

View File

@ -72,8 +72,8 @@ __FBSDID("$FreeBSD$");
#include "usbdevs.h"
#ifdef USB_DEBUG
#define DPRINTF(x) if (uscannerdebug) logprintf x
#define DPRINTFN(n,x) if (uscannerdebug>(n)) logprintf x
#define DPRINTF(x) if (uscannerdebug) printf x
#define DPRINTFN(n,x) if (uscannerdebug>(n)) printf x
int uscannerdebug = 0;
SYSCTL_NODE(_hw_usb, OID_AUTO, uscanner, CTLFLAG_RW, 0, "USB uscanner");
SYSCTL_INT(_hw_usb_uscanner, OID_AUTO, debug, CTLFLAG_RW,

View File

@ -74,7 +74,7 @@ SYSCTL_INT(_hw_usb_uvscom, OID_AUTO, debug, CTLFLAG_RW,
#define DPRINTFN(n, x) do { \
if (uvscomdebug > (n)) \
logprintf x; \
printf x; \
} while (0)
#else
#define DPRINTFN(n, x)