| usb_dynamic.c (246360) | usb_dynamic.c (250207) |
|---|---|
| 1/* $FreeBSD: head/sys/dev/usb/usb_dynamic.c 246360 2013-02-05 13:30:07Z hselasky $ */ | 1/* $FreeBSD: head/sys/dev/usb/usb_dynamic.c 250207 2013-05-03 11:10:04Z hselasky $ */ |
| 2/*- 3 * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright 9 * notice, this list of conditions and the following disclaimer. --- 38 unchanged lines hidden (view full) --- 48 49#include <dev/usb/usb.h> 50#include <dev/usb/usbdi.h> 51 52#include <dev/usb/usb_core.h> 53#include <dev/usb/usb_process.h> 54#include <dev/usb/usb_device.h> 55#include <dev/usb/usb_dynamic.h> | 2/*- 3 * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright 9 * notice, this list of conditions and the following disclaimer. --- 38 unchanged lines hidden (view full) --- 48 49#include <dev/usb/usb.h> 50#include <dev/usb/usbdi.h> 51 52#include <dev/usb/usb_core.h> 53#include <dev/usb/usb_process.h> 54#include <dev/usb/usb_device.h> 55#include <dev/usb/usb_dynamic.h> |
| 56#include <dev/usb/usb_request.h> |
|
| 56#endif /* USB_GLOBAL_INCLUDE_FILE */ 57 58/* function prototypes */ 59static usb_handle_req_t usb_temp_get_desc_w; 60static usb_temp_setup_by_index_t usb_temp_setup_by_index_w; 61static usb_temp_unsetup_t usb_temp_unsetup_w; 62static usb_test_quirk_t usb_test_quirk_w; 63static usb_quirk_ioctl_t usb_quirk_ioctl_w; --- 29 unchanged lines hidden (view full) --- 93{ 94 /* stall */ 95 return (USB_ERR_STALLED); 96} 97 98static void 99usb_temp_unsetup_w(struct usb_device *udev) 100{ | 57#endif /* USB_GLOBAL_INCLUDE_FILE */ 58 59/* function prototypes */ 60static usb_handle_req_t usb_temp_get_desc_w; 61static usb_temp_setup_by_index_t usb_temp_setup_by_index_w; 62static usb_temp_unsetup_t usb_temp_unsetup_w; 63static usb_test_quirk_t usb_test_quirk_w; 64static usb_quirk_ioctl_t usb_quirk_ioctl_w; --- 29 unchanged lines hidden (view full) --- 94{ 95 /* stall */ 96 return (USB_ERR_STALLED); 97} 98 99static void 100usb_temp_unsetup_w(struct usb_device *udev) 101{ |
| 101 if (udev->usb_template_ptr) { 102 103 free(udev->usb_template_ptr, M_USB); 104 105 udev->usb_template_ptr = NULL; 106 } | 102 usbd_free_config_desc(udev, udev->usb_template_ptr); 103 udev->usb_template_ptr = NULL; |
| 107} 108 109void 110usb_quirk_unload(void *arg) 111{ 112 /* reset function pointers */ 113 114 usb_test_quirk_p = &usb_test_quirk_w; --- 38 unchanged lines hidden --- | 104} 105 106void 107usb_quirk_unload(void *arg) 108{ 109 /* reset function pointers */ 110 111 usb_test_quirk_p = &usb_test_quirk_w; --- 38 unchanged lines hidden --- |