fc74a9f93a
struct ifnet or the layer 2 common structure it was embedded in have been replaced with a struct ifnet pointer to be filled by a call to the new function, if_alloc(). The layer 2 common structure is also allocated via if_alloc() based on the interface type. It is hung off the new struct ifnet member, if_l2com. This change removes the size of these structures from the kernel ABI and will allow us to better manage them as interfaces come and go. Other changes of note: - Struct arpcom is no longer referenced in normal interface code. Instead the Ethernet address is accessed via the IFP2ENADDR() macro. To enforce this ac_enaddr has been renamed to _ac_enaddr. - The second argument to ether_ifattach is now always the mac address from driver private storage rather than sometimes being ac_enaddr. Reviewed by: sobomax, sam
82 lines
2.7 KiB
C
82 lines
2.7 KiB
C
/*
|
|
* Copyright (c) 2003-2005 Craig Boston
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by Bill Paul.
|
|
* 4. Neither the name of the author nor the names of any co-contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL Bill Paul, THE VOICES IN HIS HEAD OR
|
|
* THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _USB_IF_CDCEREG_H_
|
|
#define _USB_IF_CDCEREG_H_
|
|
|
|
struct cdce_type {
|
|
struct usb_devno cdce_dev;
|
|
u_int16_t cdce_flags;
|
|
#define CDCE_ZAURUS 1
|
|
#define CDCE_NO_UNION 2
|
|
};
|
|
|
|
struct cdce_softc {
|
|
struct ifnet *cdce_ifp;
|
|
#define GET_IFP(sc) ((sc)->cdce_ifp)
|
|
|
|
usbd_device_handle cdce_udev;
|
|
usbd_interface_handle cdce_data_iface;
|
|
int cdce_bulkin_no;
|
|
usbd_pipe_handle cdce_bulkin_pipe;
|
|
int cdce_bulkout_no;
|
|
usbd_pipe_handle cdce_bulkout_pipe;
|
|
char cdce_dying;
|
|
device_t cdce_dev;
|
|
int cdce_unit;
|
|
|
|
struct ue_cdata cdce_cdata;
|
|
struct timeval cdce_rx_notice;
|
|
int cdce_rxeof_errors;
|
|
|
|
u_int16_t cdce_flags;
|
|
|
|
struct mtx cdce_mtx;
|
|
|
|
struct usb_qdat q;
|
|
|
|
char devinfo[1024];
|
|
};
|
|
|
|
/* We are still under Giant */
|
|
#if 0
|
|
#define CDCE_LOCK(_sc) mtx_lock(&(_sc)->cdce_mtx)
|
|
#define CDCE_UNLOCK(_sc) mtx_unlock(&(_sc)->cdce_mtx)
|
|
#else
|
|
#define CDCE_LOCK(_sc)
|
|
#define CDCE_UNLOCK(_sc)
|
|
#endif
|
|
|
|
#endif /* _USB_IF_CDCEREG_H_ */
|