Module Name: src
Committed By: tsutsui
Date: Sun Mar 20 17:38:11 UTC 2011
Modified Files:
src/sys/dev/usb: usb_mem.c usb_subr.c
Log Message:
Move MALLOC_DEFINE()s from usb_mem.c to usb_subr.c.
usb_mem.c provides functions for DMA memory allocation
that is required by DMA capable host controllers only,
but MALLOC_DEFINE() isn't DMA specific and could be required
by any USB drivers.
Discussed on current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/usb_mem.c
cvs rdiff -u -r1.177 -r1.178 src/sys/dev/usb/usb_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.45 src/sys/dev/usb/usb_mem.c:1.46
--- src/sys/dev/usb/usb_mem.c:1.45 Tue Jan 4 01:37:55 2011
+++ src/sys/dev/usb/usb_mem.c Sun Mar 20 17:38:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.45 2011/01/04 01:37:55 matt Exp $ */
+/* $NetBSD: usb_mem.c,v 1.46 2011/03/20 17:38:11 tsutsui Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.45 2011/01/04 01:37:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.46 2011/03/20 17:38:11 tsutsui Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -75,10 +75,6 @@
#define DPRINTFN(n,x)
#endif
-MALLOC_DEFINE(M_USB, "USB", "USB misc. memory");
-MALLOC_DEFINE(M_USBDEV, "USB device", "USB device driver");
-MALLOC_DEFINE(M_USBHC, "USB HC", "USB host controller");
-
#define USB_MEM_SMALL 64
#define USB_MEM_CHUNKS 64
#define USB_MEM_BLOCK (USB_MEM_SMALL * USB_MEM_CHUNKS)
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.177 src/sys/dev/usb/usb_subr.c:1.178
--- src/sys/dev/usb/usb_subr.c:1.177 Wed Nov 3 22:34:24 2010
+++ src/sys/dev/usb/usb_subr.c Sun Mar 20 17:38:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.177 2010/11/03 22:34:24 dyoung Exp $ */
+/* $NetBSD: usb_subr.c,v 1.178 2011/03/20 17:38:11 tsutsui Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.177 2010/11/03 22:34:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.178 2011/03/20 17:38:11 tsutsui Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usbverbose.h"
@@ -68,6 +68,10 @@
#define DPRINTFN(n,x)
#endif
+MALLOC_DEFINE(M_USB, "USB", "USB misc. memory");
+MALLOC_DEFINE(M_USBDEV, "USB device", "USB device driver");
+MALLOC_DEFINE(M_USBHC, "USB HC", "USB host controller");
+
Static usbd_status usbd_set_config(usbd_device_handle, int);
Static void usbd_devinfo(usbd_device_handle, int, char *, size_t);
Static void usbd_devinfo_vp(usbd_device_handle, char *, size_t, char *, size_t,
