From owner-p4-projects@FreeBSD.ORG Sun Apr 20 17:15:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7DE81065671; Sun, 20 Apr 2008 17:15:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87E3B1065673 for ; Sun, 20 Apr 2008 17:15:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 777BD8FC21 for ; Sun, 20 Apr 2008 17:15:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KHFWl2061694 for ; Sun, 20 Apr 2008 17:15:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KHFWod061692 for perforce@freebsd.org; Sun, 20 Apr 2008 17:15:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 20 Apr 2008 17:15:32 GMT Message-Id: <200804201715.m3KHFWod061692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 140310 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Apr 2008 17:15:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=140310 Change 140310 by hselasky@hselasky_laptop001 on 2008/04/20 17:15:07 Style change: Prototypes should be on a single line. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#47 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#49 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#44 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#45 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#47 (text+ko) ==== @@ -216,27 +216,13 @@ static usbd_callback_t aue_bulk_write_clear_stall_callback; static usbd_callback_t aue_bulk_write_callback; -static void -aue_cfg_do_request(struct aue_softc *sc, usb_device_request_t *req, - void *data); -static uint8_t - aue_cfg_csr_read_1(struct aue_softc *sc, uint16_t reg); - -static uint16_t - aue_cfg_csr_read_2(struct aue_softc *sc, uint16_t reg); - -static void - aue_cfg_csr_write_1(struct aue_softc *sc, uint16_t reg, uint8_t val); - -static void - aue_cfg_csr_write_2(struct aue_softc *sc, uint16_t reg, uint16_t val); - -static void -aue_cfg_eeprom_getword(struct aue_softc *sc, uint8_t addr, - uint8_t *dest); -static void -aue_cfg_read_eeprom(struct aue_softc *sc, uint8_t *dest, - uint16_t off, uint16_t len); +static void aue_cfg_do_request(struct aue_softc *sc, usb_device_request_t *req, void *data); +static uint8_t aue_cfg_csr_read_1(struct aue_softc *sc, uint16_t reg); +static uint16_t aue_cfg_csr_read_2(struct aue_softc *sc, uint16_t reg); +static void aue_cfg_csr_write_1(struct aue_softc *sc, uint16_t reg, uint8_t val); +static void aue_cfg_csr_write_2(struct aue_softc *sc, uint16_t reg, uint16_t val); +static void aue_cfg_eeprom_getword(struct aue_softc *sc, uint8_t addr, uint8_t *dest); +static void aue_cfg_read_eeprom(struct aue_softc *sc, uint8_t *dest, uint16_t off, uint16_t len); static miibus_readreg_t aue_cfg_miibus_readreg; static miibus_writereg_t aue_cfg_miibus_writereg; @@ -253,32 +239,15 @@ static usbd_config_td_command_t aue_cfg_pre_stop; static usbd_config_td_command_t aue_cfg_stop; -static void - aue_cfg_reset_pegasus_II(struct aue_softc *sc); - -static void - aue_cfg_reset(struct aue_softc *sc); - -static void - aue_start_cb(struct ifnet *ifp); - -static void - aue_init_cb(void *arg); - -static void - aue_start_transfers(struct aue_softc *sc); - -static int - aue_ifmedia_upd_cb(struct ifnet *ifp); - -static void - aue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr); - -static int - aue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); - -static void - aue_watchdog(void *arg); +static void aue_cfg_reset_pegasus_II(struct aue_softc *sc); +static void aue_cfg_reset(struct aue_softc *sc); +static void aue_start_cb(struct ifnet *ifp); +static void aue_init_cb(void *arg); +static void aue_start_transfers(struct aue_softc *sc); +static int aue_ifmedia_upd_cb(struct ifnet *ifp); +static void aue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr); +static int aue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); +static void aue_watchdog(void *arg); static const struct usbd_config aue_config[AUE_ENDPT_MAX] = { ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#49 (text+ko) ==== @@ -179,9 +179,7 @@ static usbd_callback_t axe_bulk_write_clear_stall_callback; static usbd_callback_t axe_bulk_write_callback; -static void -axe_cfg_cmd(struct axe_softc *sc, uint16_t cmd, uint16_t index, - uint16_t val, void *buf); +static void axe_cfg_cmd(struct axe_softc *sc, uint16_t cmd, uint16_t index, uint16_t val, void *buf); static miibus_readreg_t axe_cfg_miibus_readreg; static miibus_writereg_t axe_cfg_miibus_writereg; @@ -198,35 +196,16 @@ static usbd_config_td_command_t axe_cfg_pre_stop; static usbd_config_td_command_t axe_cfg_stop; -static int - axe_ifmedia_upd_cb(struct ifnet *ifp); - -static void - axe_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr); - -static void - axe_cfg_reset(struct axe_softc *sc); - -static void - axe_start_cb(struct ifnet *ifp); - -static void - axe_start_transfers(struct axe_softc *sc); - -static void - axe_init_cb(void *arg); - -static int - axe_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); - -static void - axe_watchdog(void *arg); - -static void - axe_cfg_ax88178_init(struct axe_softc *); - -static void - axe_cfg_ax88772_init(struct axe_softc *); +static int axe_ifmedia_upd_cb(struct ifnet *ifp); +static void axe_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr); +static void axe_cfg_reset(struct axe_softc *sc); +static void axe_start_cb(struct ifnet *ifp); +static void axe_start_transfers(struct axe_softc *sc); +static void axe_init_cb(void *arg); +static int axe_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); +static void axe_watchdog(void *arg); +static void axe_cfg_ax88178_init(struct axe_softc *); +static void axe_cfg_ax88772_init(struct axe_softc *); static const struct usbd_config axe_config[AXE_ENDPT_MAX] = { ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#42 (text+ko) ==== @@ -120,44 +120,19 @@ static usbd_config_td_command_t cue_cfg_pre_stop; static usbd_config_td_command_t cue_cfg_stop; -static void -cue_cfg_do_request(struct cue_softc *sc, usb_device_request_t *req, - void *data); -static uint8_t - cue_cfg_csr_read_1(struct cue_softc *sc, uint16_t reg); - -static uint16_t - cue_cfg_csr_read_2(struct cue_softc *sc, uint8_t reg); - -static void - cue_cfg_csr_write_1(struct cue_softc *sc, uint16_t reg, uint16_t val); - -static void -cue_cfg_mem(struct cue_softc *sc, uint8_t cmd, uint16_t addr, - void *buf, uint16_t len); -static void - cue_cfg_getmac(struct cue_softc *sc, void *buf); - -static uint32_t - cue_mchash(const uint8_t *addr); - -static void - cue_cfg_reset(struct cue_softc *sc); - -static void - cue_start_cb(struct ifnet *ifp); - -static void - cue_start_transfers(struct cue_softc *sc); - -static void - cue_init_cb(void *arg); - -static int - cue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); - -static void - cue_watchdog(void *arg); +static void cue_cfg_do_request(struct cue_softc *sc, usb_device_request_t *req, void *data); +static uint8_t cue_cfg_csr_read_1(struct cue_softc *sc, uint16_t reg); +static uint16_t cue_cfg_csr_read_2(struct cue_softc *sc, uint8_t reg); +static void cue_cfg_csr_write_1(struct cue_softc *sc, uint16_t reg, uint16_t val); +static void cue_cfg_mem(struct cue_softc *sc, uint8_t cmd, uint16_t addr, void *buf, uint16_t len); +static void cue_cfg_getmac(struct cue_softc *sc, void *buf); +static uint32_t cue_mchash(const uint8_t *addr); +static void cue_cfg_reset(struct cue_softc *sc); +static void cue_start_cb(struct ifnet *ifp); +static void cue_start_transfers(struct cue_softc *sc); +static void cue_init_cb(void *arg); +static int cue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); +static void cue_watchdog(void *arg); #define DPRINTF(...) ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#44 (text+ko) ==== @@ -163,35 +163,16 @@ static usbd_config_td_command_t kue_cfg_pre_stop; static usbd_config_td_command_t kue_cfg_stop; -static void -kue_cfg_do_request(struct kue_softc *sc, usb_device_request_t *req, - void *data); -static void - kue_cfg_setword(struct kue_softc *sc, uint8_t breq, uint16_t word); - -static void -kue_cfg_ctl(struct kue_softc *sc, uint8_t rw, uint8_t breq, - uint16_t val, void *data, uint16_t len); -static void - kue_cfg_load_fw(struct kue_softc *sc); - -static void - kue_cfg_reset(struct kue_softc *sc); - -static void - kue_start_cb(struct ifnet *ifp); - -static void - kue_start_transfers(struct kue_softc *sc); - -static void - kue_init_cb(void *arg); - -static int - kue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); - -static void - kue_watchdog(void *arg); +static void kue_cfg_do_request(struct kue_softc *sc, usb_device_request_t *req, void *data); +static void kue_cfg_setword(struct kue_softc *sc, uint8_t breq, uint16_t word); +static void kue_cfg_ctl(struct kue_softc *sc, uint8_t rw, uint8_t breq, uint16_t val, void *data, uint16_t len); +static void kue_cfg_load_fw(struct kue_softc *sc); +static void kue_cfg_reset(struct kue_softc *sc); +static void kue_start_cb(struct ifnet *ifp); +static void kue_start_transfers(struct kue_softc *sc); +static void kue_init_cb(void *arg); +static int kue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); +static void kue_watchdog(void *arg); #define DPRINTF(...) ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#42 (text+ko) ==== @@ -156,57 +156,27 @@ static usbd_config_td_command_t rue_cfg_pre_stop; static usbd_config_td_command_t rue_cfg_stop; -static void -rue_cfg_do_request(struct rue_softc *sc, usb_device_request_t *req, - void *data); -static void -rue_cfg_read_mem(struct rue_softc *sc, uint16_t addr, void *buf, - uint16_t len); -static void -rue_cfg_write_mem(struct rue_softc *sc, uint16_t addr, void *buf, - uint16_t len); -static uint8_t - rue_cfg_csr_read_1(struct rue_softc *sc, uint16_t reg); - -static uint16_t - rue_cfg_csr_read_2(struct rue_softc *sc, uint16_t reg); - -static void - rue_cfg_csr_write_1(struct rue_softc *sc, uint16_t reg, uint8_t val); - -static void - rue_cfg_csr_write_2(struct rue_softc *sc, uint16_t reg, uint16_t val); - -static void - rue_cfg_csr_write_4(struct rue_softc *sc, int reg, uint32_t val); +static void rue_cfg_do_request(struct rue_softc *sc, usb_device_request_t *req, void *data); +static void rue_cfg_read_mem(struct rue_softc *sc, uint16_t addr, void *buf, uint16_t len); +static void rue_cfg_write_mem(struct rue_softc *sc, uint16_t addr, void *buf, uint16_t len); +static uint8_t rue_cfg_csr_read_1(struct rue_softc *sc, uint16_t reg); +static uint16_t rue_cfg_csr_read_2(struct rue_softc *sc, uint16_t reg); +static void rue_cfg_csr_write_1(struct rue_softc *sc, uint16_t reg, uint8_t val); +static void rue_cfg_csr_write_2(struct rue_softc *sc, uint16_t reg, uint16_t val); +static void rue_cfg_csr_write_4(struct rue_softc *sc, int reg, uint32_t val); static miibus_readreg_t rue_cfg_miibus_readreg; static miibus_writereg_t rue_cfg_miibus_writereg; static miibus_statchg_t rue_cfg_miibus_statchg; -static void - rue_cfg_reset(struct rue_softc *sc); - -static void - rue_start_cb(struct ifnet *ifp); - -static void - rue_start_transfers(struct rue_softc *sc); - -static void - rue_init_cb(void *arg); - -static int - rue_ifmedia_upd_cb(struct ifnet *ifp); - -static void - rue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr); - -static int - rue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); - -static void - rue_watchdog(void *arg); +static void rue_cfg_reset(struct rue_softc *sc); +static void rue_start_cb(struct ifnet *ifp); +static void rue_start_transfers(struct rue_softc *sc); +static void rue_init_cb(void *arg); +static int rue_ifmedia_upd_cb(struct ifnet *ifp); +static void rue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr); +static int rue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); +static void rue_watchdog(void *arg); static const struct usbd_config rue_config[RUE_ENDPT_MAX] = { ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#45 (text+ko) ==== @@ -112,44 +112,19 @@ static usbd_config_td_command_t udav_cfg_ifmedia_change; static usbd_config_td_command_t udav_cfg_tick; -static void -udav_cfg_do_request(struct udav_softc *sc, usb_device_request_t *req, - void *data); -static void -udav_cfg_csr_read(struct udav_softc *sc, uint16_t offset, void *buf, - uint16_t len); -static void -udav_cfg_csr_write(struct udav_softc *sc, uint16_t offset, void *buf, - uint16_t len); -static uint8_t - udav_cfg_csr_read1(struct udav_softc *sc, uint16_t offset); - -static void -udav_cfg_csr_write1(struct udav_softc *sc, uint16_t offset, - uint8_t ch); -static void - udav_init_cb(void *arg); - -static void - udav_cfg_reset(struct udav_softc *sc); - -static void - udav_start_cb(struct ifnet *ifp); - -static void - udav_start_transfers(struct udav_softc *sc); - -static int - udav_ioctl_cb(struct ifnet *ifp, u_long cmd, caddr_t data); - -static void - udav_watchdog(void *arg); - -static int - udav_ifmedia_change_cb(struct ifnet *ifp); - -static void - udav_ifmedia_status_cb(struct ifnet *ifp, struct ifmediareq *ifmr); +static void udav_cfg_do_request(struct udav_softc *sc, usb_device_request_t *req, void *data); +static void udav_cfg_csr_read(struct udav_softc *sc, uint16_t offset, void *buf, uint16_t len); +static void udav_cfg_csr_write(struct udav_softc *sc, uint16_t offset, void *buf, uint16_t len); +static uint8_t udav_cfg_csr_read1(struct udav_softc *sc, uint16_t offset); +static void udav_cfg_csr_write1(struct udav_softc *sc, uint16_t offset, uint8_t ch); +static void udav_init_cb(void *arg); +static void udav_cfg_reset(struct udav_softc *sc); +static void udav_start_cb(struct ifnet *ifp); +static void udav_start_transfers(struct udav_softc *sc); +static int udav_ioctl_cb(struct ifnet *ifp, u_long cmd, caddr_t data); +static void udav_watchdog(void *arg); +static int udav_ifmedia_change_cb(struct ifnet *ifp); +static void udav_ifmedia_status_cb(struct ifnet *ifp, struct ifmediareq *ifmr); static miibus_readreg_t udav_cfg_miibus_readreg; static miibus_writereg_t udav_cfg_miibus_writereg;