svn commit: r365134 - in head/sys/dev/vt: . hw/ofwfb
Author: mjg
Date: Tue Sep 1 21:47:32 2020
New Revision: 365134
URL: https://svnweb.freebsd.org/changeset/base/365134
Log:
vt: clean up empty lines in .c and .h files
Modified:
head/sys/dev/vt/hw/ofwfb/ofwfb.c
head/sys/dev/vt/vt.h
head/sys/dev/vt/vt_buf.c
head/sys/dev/vt/vt_core.c
Modified: head/sys/dev/vt/hw/ofwfb/ofwfb.c
==
--- head/sys/dev/vt/hw/ofwfb/ofwfb.cTue Sep 1 21:47:20 2020
(r365133)
+++ head/sys/dev/vt/hw/ofwfb/ofwfb.cTue Sep 1 21:47:32 2020
(r365134)
@@ -504,7 +504,6 @@ ofwfb_init(struct vt_device *vd)
#endif
}
-
#if defined(__powerpc__)
/*
* If we are running on PowerPC in real mode (supported only on AIM
@@ -521,4 +520,3 @@ ofwfb_init(struct vt_device *vd)
return (CN_INTERNAL);
}
-
Modified: head/sys/dev/vt/vt.h
==
--- head/sys/dev/vt/vt.hTue Sep 1 21:47:20 2020(r365133)
+++ head/sys/dev/vt/vt.hTue Sep 1 21:47:32 2020(r365134)
@@ -450,4 +450,3 @@ extern const unsigned int vt_logo_sprite_width;
void vtterm_draw_cpu_logos(struct vt_device *);
#endif /* !_DEV_VT_VT_H_ */
-
Modified: head/sys/dev/vt/vt_buf.c
==
--- head/sys/dev/vt/vt_buf.cTue Sep 1 21:47:20 2020(r365133)
+++ head/sys/dev/vt/vt_buf.cTue Sep 1 21:47:32 2020(r365134)
@@ -706,7 +706,6 @@ vtbuf_flush_mark(struct vt_buf *vb)
/* Notify renderer to update marked region. */
if ((vb->vb_mark_start.tp_col != vb->vb_mark_end.tp_col) ||
(vb->vb_mark_start.tp_row != vb->vb_mark_end.tp_row)) {
-
s = vtbuf_htw(vb, vb->vb_mark_start.tp_row);
e = vtbuf_htw(vb, vb->vb_mark_end.tp_row);
Modified: head/sys/dev/vt/vt_core.c
==
--- head/sys/dev/vt/vt_core.c Tue Sep 1 21:47:20 2020(r365133)
+++ head/sys/dev/vt/vt_core.c Tue Sep 1 21:47:32 2020(r365134)
@@ -1422,7 +1422,6 @@ vtterm_splash(struct vt_device *vd)
/* Display a nice boot splash. */
if (!(vd->vd_flags & VDF_TEXTMODE) && (boothowto & RB_MUTE)) {
-
top = (vd->vd_height - vt_logo_height) / 2;
left = (vd->vd_width - vt_logo_width) / 2;
switch (vt_logo_depth) {
@@ -1437,7 +1436,6 @@ vtterm_splash(struct vt_device *vd)
}
#endif
-
static void
vtterm_cnprobe(struct terminal *tm, struct consdev *cp)
{
@@ -2729,7 +2727,6 @@ vt_upgrade(struct vt_device *vd)
vt_window_switch, vw, SHUTDOWN_PRI_DEFAULT);
}
}
-
}
VT_LOCK(vd);
if (vd->vd_curwindow == NULL)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365132 - head/sys/dev/wbwd
Author: mjg
Date: Tue Sep 1 21:46:58 2020
New Revision: 365132
URL: https://svnweb.freebsd.org/changeset/base/365132
Log:
wbwd: clean up empty lines in .c and .h files
Modified:
head/sys/dev/wbwd/wbwd.c
Modified: head/sys/dev/wbwd/wbwd.c
==
--- head/sys/dev/wbwd/wbwd.cTue Sep 1 21:46:42 2020(r365131)
+++ head/sys/dev/wbwd/wbwd.cTue Sep 1 21:46:58 2020(r365132)
@@ -236,7 +236,6 @@ struct winbond_vendor_device_id {
},
};
-
/*
* Return the watchdog related registers as we last read them. This will
* usually not give the current timeout or state on whether the watchdog
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365133 - head/sys/dev/watchdog
Author: mjg
Date: Tue Sep 1 21:47:20 2020
New Revision: 365133
URL: https://svnweb.freebsd.org/changeset/base/365133
Log:
watchdog: clean up empty lines in .c and .h files
Modified:
head/sys/dev/watchdog/watchdog.c
Modified: head/sys/dev/watchdog/watchdog.c
==
--- head/sys/dev/watchdog/watchdog.cTue Sep 1 21:46:58 2020
(r365132)
+++ head/sys/dev/watchdog/watchdog.cTue Sep 1 21:47:20 2020
(r365133)
@@ -120,7 +120,6 @@ seconds_to_pow2ns(int seconds)
return (power);
}
-
int
wdog_kern_pat(u_int utim)
{
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365131 - head/sys/dev/wi
Author: mjg
Date: Tue Sep 1 21:46:42 2020
New Revision: 365131
URL: https://svnweb.freebsd.org/changeset/base/365131
Log:
wi: clean up empty lines in .c and .h files
Modified:
head/sys/dev/wi/if_wavelan_ieee.h
head/sys/dev/wi/if_wi.c
head/sys/dev/wi/if_wi_macio.c
head/sys/dev/wi/if_wi_pccard.c
head/sys/dev/wi/if_wi_pci.c
Modified: head/sys/dev/wi/if_wavelan_ieee.h
==
--- head/sys/dev/wi/if_wavelan_ieee.h Tue Sep 1 21:46:27 2020
(r365130)
+++ head/sys/dev/wi/if_wavelan_ieee.h Tue Sep 1 21:46:42 2020
(r365131)
@@ -478,7 +478,6 @@ struct wi_rx_frame {
#define WI_MGMT_HDRLEN 0x3C
#define WI_CTL_HDRLEN 0x3C
-
/*
* all data packets have a snap (sub-network access protocol) header that
* isn't entirely definied, but added for ethernet compatibility.
@@ -488,7 +487,6 @@ struct wi_snap_frame {
u_int16_t wi_type;
};
-
/*
* management frame headers
* note: all management frames consist of a static header and variable length
@@ -592,7 +590,6 @@ struct wi_mgmt_deauth_hdr {
u_int16_t wi_reason;
};
-
/*
* rid configuration register definitions
*/
@@ -602,7 +599,6 @@ struct wi_mgmt_deauth_hdr {
#define WI_RID_PROCFRAME 0x3137 /* Return full frame information */
#define WI_RID_PRISM2 0x3138 /* tell if we're a prism2 card or not */
-
/*
* 802.11 definitions
*/
@@ -650,7 +646,6 @@ struct wi_mgmt_deauth_hdr {
#define WI_FCS_LEN 0x4 /* checksum length */
-
/*
* management definitions
*/
@@ -693,7 +688,6 @@ struct wi_mgmt_deauth_hdr {
#define WI_VAR_SRATES_MASK 0x7F
-
/*
* control definitions
*/
@@ -704,7 +698,6 @@ struct wi_mgmt_deauth_hdr {
#define WI_STYPE_CTL_CFEND 0x00E0
#define WI_STYPE_CTL_CFENDCFACK0x00F0
-
/*
* ap scanning structures
*/
@@ -728,7 +721,6 @@ struct wi_scan_p2_hdr {
u_int16_t wi_reason;
};
#define WI_PRISM2_RES_SIZE 62
-
/*
* prism2 debug mode definitions
Modified: head/sys/dev/wi/if_wi.c
==
--- head/sys/dev/wi/if_wi.c Tue Sep 1 21:46:27 2020(r365130)
+++ head/sys/dev/wi/if_wi.c Tue Sep 1 21:46:42 2020(r365131)
@@ -162,7 +162,7 @@ static void wi_scan_end(struct ieee80211com *);
static void wi_getradiocaps(struct ieee80211com *, int, int *,
struct ieee80211_channel[]);
static void wi_set_channel(struct ieee80211com *);
-
+
static __inline int
wi_write_val(struct wi_softc *sc, int rid, u_int16_t val)
{
Modified: head/sys/dev/wi/if_wi_macio.c
==
--- head/sys/dev/wi/if_wi_macio.c Tue Sep 1 21:46:27 2020
(r365130)
+++ head/sys/dev/wi/if_wi_macio.c Tue Sep 1 21:46:42 2020
(r365131)
@@ -87,7 +87,6 @@ static device_method_t wi_macio_methods[] = {
DEVMETHOD(device_attach,wi_macio_attach),
DEVMETHOD(device_detach,wi_detach),
DEVMETHOD(device_shutdown, wi_shutdown),
-
{ 0, 0 }
};
Modified: head/sys/dev/wi/if_wi_pccard.c
==
--- head/sys/dev/wi/if_wi_pccard.c Tue Sep 1 21:46:27 2020
(r365130)
+++ head/sys/dev/wi/if_wi_pccard.c Tue Sep 1 21:46:42 2020
(r365131)
@@ -85,7 +85,6 @@ static device_method_t wi_pccard_methods[] = {
DEVMETHOD(device_attach,wi_pccard_attach),
DEVMETHOD(device_detach,wi_detach),
DEVMETHOD(device_shutdown, wi_shutdown),
-
{ 0, 0 }
};
Modified: head/sys/dev/wi/if_wi_pci.c
==
--- head/sys/dev/wi/if_wi_pci.c Tue Sep 1 21:46:27 2020(r365130)
+++ head/sys/dev/wi/if_wi_pci.c Tue Sep 1 21:46:42 2020(r365131)
@@ -84,7 +84,6 @@ static device_method_t wi_pci_methods[] = {
DEVMETHOD(device_shutdown, wi_shutdown),
DEVMETHOD(device_suspend, wi_pci_suspend),
DEVMETHOD(device_resume,wi_pci_resume),
-
{ 0, 0 }
};
@@ -246,7 +245,7 @@ wi_pci_suspend(device_t dev)
WI_LOCK(sc);
wi_stop(sc, 1);
WI_UNLOCK(sc);
-
+
return (0);
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365130 - head/sys/dev/wpi
Author: mjg
Date: Tue Sep 1 21:46:27 2020
New Revision: 365130
URL: https://svnweb.freebsd.org/changeset/base/365130
Log:
wpi: clean up empty lines in .c and .h files
Modified:
head/sys/dev/wpi/if_wpireg.h
Modified: head/sys/dev/wpi/if_wpireg.h
==
--- head/sys/dev/wpi/if_wpireg.hTue Sep 1 21:45:35 2020
(r365129)
+++ head/sys/dev/wpi/if_wpireg.hTue Sep 1 21:46:27 2020
(r365130)
@@ -92,7 +92,6 @@
#define WPI_FH_MSG_CONFIG 0xe88
#define WPI_FH_TX_STATUS 0xe90
-
/*
* NIC internal memory offsets.
*/
@@ -119,7 +118,6 @@
#define WPI_BSM_DRAM_DATA_SIZE 0x349c
#define WPI_BSM_SRAM_BASE 0x3800
-
/* Possible flags for register WPI_HW_IF_CONFIG. */
#define WPI_HW_IF_CONFIG_ALM_MB(1 << 8)
#define WPI_HW_IF_CONFIG_ALM_MM(1 << 9)
@@ -558,7 +556,6 @@ struct wpi_beacon_missed {
uint32_t received;
} __packed;
-
/* Structure for command WPI_CMD_MRR_SETUP. */
#define WPI_RIDX_MAX 11
struct wpi_mrr_setup {
@@ -806,7 +803,6 @@ struct wpi_stats {
/* Possible flags for command WPI_CMD_GET_STATISTICS. */
#define WPI_STATISTICS_BEACON_DISABLE (1 << 1)
-
/* Firmware error dump entry. */
struct wpi_fw_dump {
uint32_tdesc;
@@ -818,7 +814,6 @@ struct wpi_fw_dump {
/* Firmware image file header. */
struct wpi_firmware_hdr {
-
#define WPI_FW_MINVERSION 2144
#define WPI_FW_NAME "wpifw"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365129 - in head/sys/dev/wtap: . plugins wtap_hal
Author: mjg
Date: Tue Sep 1 21:45:35 2020
New Revision: 365129
URL: https://svnweb.freebsd.org/changeset/base/365129
Log:
wtap: clean up empty lines in .c and .h files
Modified:
head/sys/dev/wtap/if_wtap_module.c
head/sys/dev/wtap/plugins/visibility.c
head/sys/dev/wtap/plugins/visibility.h
head/sys/dev/wtap/plugins/visibility_ioctl.h
head/sys/dev/wtap/plugins/wtap_plugin.h
head/sys/dev/wtap/wtap_hal/hal.c
head/sys/dev/wtap/wtap_hal/hal.h
head/sys/dev/wtap/wtap_hal/handler.h
Modified: head/sys/dev/wtap/if_wtap_module.c
==
--- head/sys/dev/wtap/if_wtap_module.c Tue Sep 1 21:45:08 2020
(r365128)
+++ head/sys/dev/wtap/if_wtap_module.c Tue Sep 1 21:45:35 2020
(r365129)
@@ -70,12 +70,10 @@
#include
-
#include
#include/* cdevsw struct */
#include /* uio struct */
-
#include
#include
@@ -131,7 +129,6 @@ wtap_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
CURVNET_RESTORE();
return error;
}
-
/* The function called at load/unload. */
static int
Modified: head/sys/dev/wtap/plugins/visibility.c
==
--- head/sys/dev/wtap/plugins/visibility.c Tue Sep 1 21:45:08 2020
(r365128)
+++ head/sys/dev/wtap/plugins/visibility.c Tue Sep 1 21:45:35 2020
(r365129)
@@ -70,7 +70,6 @@
#include
-
#include
#include/* cdevsw struct */
#include /* uio struct */
@@ -200,7 +199,6 @@ del_link(struct visibility_plugin *vis_plugin, struct
#endif
}
-
int
vis_ioctl(struct cdev *sdev, u_long cmd, caddr_t data,
int fflag, struct thread *td)
@@ -239,4 +237,3 @@ vis_ioctl(struct cdev *sdev, u_long cmd, caddr_t data,
CURVNET_RESTORE();
return error;
}
-
Modified: head/sys/dev/wtap/plugins/visibility.h
==
--- head/sys/dev/wtap/plugins/visibility.h Tue Sep 1 21:45:08 2020
(r365128)
+++ head/sys/dev/wtap/plugins/visibility.h Tue Sep 1 21:45:35 2020
(r365129)
@@ -55,4 +55,3 @@ void visibility_deinit(struct wtap_plugin *);
void visibility_work(struct wtap_plugin *, struct packet *);
#endif
-
Modified: head/sys/dev/wtap/plugins/visibility_ioctl.h
==
--- head/sys/dev/wtap/plugins/visibility_ioctl.hTue Sep 1 21:45:08
2020(r365128)
+++ head/sys/dev/wtap/plugins/visibility_ioctl.hTue Sep 1 21:45:35
2020(r365129)
@@ -50,4 +50,3 @@ struct link {
#define VISIOCTLLINK _IOW('W', 4, struct link) //
#endif
-
Modified: head/sys/dev/wtap/plugins/wtap_plugin.h
==
--- head/sys/dev/wtap/plugins/wtap_plugin.h Tue Sep 1 21:45:08 2020
(r365128)
+++ head/sys/dev/wtap/plugins/wtap_plugin.h Tue Sep 1 21:45:35 2020
(r365129)
@@ -37,7 +37,6 @@
#include "../if_medium.h"
#include "../wtap_hal/hal.h"
-
struct wtap_plugin {
struct cdev *wp_sdev;
struct wtap_hal *wp_hal;
@@ -47,4 +46,3 @@ struct wtap_plugin {
};
#endif
-
Modified: head/sys/dev/wtap/wtap_hal/hal.c
==
--- head/sys/dev/wtap/wtap_hal/hal.cTue Sep 1 21:45:08 2020
(r365128)
+++ head/sys/dev/wtap/wtap_hal/hal.cTue Sep 1 21:45:35 2020
(r365129)
@@ -214,4 +214,3 @@ free_wtap(struct wtap_hal *hal, int32_t id)
hal->hal_devs[id] = NULL;
return 0;
}
-
Modified: head/sys/dev/wtap/wtap_hal/hal.h
==
--- head/sys/dev/wtap/wtap_hal/hal.hTue Sep 1 21:45:08 2020
(r365128)
+++ head/sys/dev/wtap/wtap_hal/hal.hTue Sep 1 21:45:35 2020
(r365129)
@@ -52,6 +52,4 @@ void deregister_plugin(struct wtap_hal *);
int32_t new_wtap(struct wtap_hal *, int32_t id);
int32_t free_wtap(struct wtap_hal *, int32_t id);
-
#endif
-
Modified: head/sys/dev/wtap/wtap_hal/handler.h
==
--- head/sys/dev/wtap/wtap_hal/handler.hTue Sep 1 21:45:08 2020
(r365128)
+++ head/sys/dev/wtap/wtap_hal/handler.hTue Sep 1 21:45:35 2020
(r365129)
@@ -49,4 +49,3 @@ struct eventhandler {
};
#endif
-
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365128 - in head/sys/dev/xen: balloon blkback blkfront control gntdev grant_table netback netfront pcifront xenpci xenstore
Author: mjg
Date: Tue Sep 1 21:45:08 2020
New Revision: 365128
URL: https://svnweb.freebsd.org/changeset/base/365128
Log:
dev/xen: clean up empty lines in .c and .h files
Modified:
head/sys/dev/xen/balloon/balloon.c
head/sys/dev/xen/blkback/blkback.c
head/sys/dev/xen/blkfront/blkfront.c
head/sys/dev/xen/control/control.c
head/sys/dev/xen/gntdev/gntdev.c
head/sys/dev/xen/grant_table/grant_table.c
head/sys/dev/xen/netback/netback.c
head/sys/dev/xen/netback/netback_unit_tests.c
head/sys/dev/xen/netfront/netfront.c
head/sys/dev/xen/pcifront/pcifront.c
head/sys/dev/xen/xenpci/xenpci.c
head/sys/dev/xen/xenstore/xenstore.c
head/sys/dev/xen/xenstore/xenstore_dev.c
head/sys/dev/xen/xenstore/xenstored_dev.c
Modified: head/sys/dev/xen/balloon/balloon.c
==
--- head/sys/dev/xen/balloon/balloon.c Tue Sep 1 21:44:42 2020
(r365127)
+++ head/sys/dev/xen/balloon/balloon.c Tue Sep 1 21:45:08 2020
(r365128)
@@ -274,7 +274,7 @@ balloon_process(void *unused)
{
int need_sleep = 0;
long credit;
-
+
mtx_lock(_mutex);
for (;;) {
int sleep_time;
Modified: head/sys/dev/xen/blkback/blkback.c
==
--- head/sys/dev/xen/blkback/blkback.c Tue Sep 1 21:44:42 2020
(r365127)
+++ head/sys/dev/xen/blkback/blkback.c Tue Sep 1 21:45:08 2020
(r365128)
@@ -256,7 +256,6 @@ struct xbb_xen_reqlist {
*/
uint64_t gnt_base;
-
#ifdef XBB_USE_BOUNCE_BUFFERS
/**
* Pre-allocated domain local memory used to proxy remote
@@ -545,7 +544,6 @@ typedef int (*xbb_dispatch_t)(struct xbb_softc *xbb,
* Per-instance configuration data.
*/
struct xbb_softc {
-
/**
* Task-queue used to process I/O requests.
*/
@@ -1029,7 +1027,6 @@ xbb_get_kva(struct xbb_softc *xbb, int nr_pages)
* to satisfy the request.
*/
if (++num_clear == nr_pages) {
-
bit_nset(xbb->kva_free, first_clear,
first_clear + nr_pages - 1);
@@ -1093,7 +1090,6 @@ xbb_unmap_reqlist(struct xbb_xen_reqlist *reqlist)
invcount = 0;
for (i = 0; i < reqlist->nr_segments; i++) {
-
if (reqlist->gnt_handles[i] == GRANT_REF_INVALID)
continue;
@@ -1127,7 +1123,6 @@ xbb_get_reqlist(struct xbb_softc *xbb)
mtx_assert(>lock, MA_OWNED);
if ((reqlist = STAILQ_FIRST(>reqlist_free_stailq)) != NULL) {
-
STAILQ_REMOVE_HEAD(>reqlist_free_stailq, links);
reqlist->flags = XBB_REQLIST_NONE;
reqlist->kva = NULL;
@@ -1366,7 +1361,6 @@ xbb_push_responses(struct xbb_softc *xbb, int *run_tas
RING_PUSH_RESPONSES_AND_CHECK_NOTIFY(>rings.common, *notify);
if (xbb->rings.common.rsp_prod_pvt == xbb->rings.common.req_cons) {
-
/*
* Tail check for pending requests. Allows frontend to avoid
* notifications if requests are already in flight (lower
@@ -1374,7 +1368,6 @@ xbb_push_responses(struct xbb_softc *xbb, int *run_tas
*/
RING_FINAL_CHECK_FOR_REQUESTS(>rings.common, more_to_do);
} else if (RING_HAS_UNCONSUMED_REQUESTS(>rings.common)) {
-
more_to_do = 1;
}
@@ -1505,7 +1498,6 @@ xbb_bio_done(struct bio *bio)
if (bio->bio_error == ENXIO
&& xenbus_get_state(xbb->dev) == XenbusStateConnected) {
-
/*
* Backend device has disappeared. Signal the
* front-end that we (the device proxy) want to
@@ -1744,7 +1736,6 @@ xbb_dispatch_io(struct xbb_softc *xbb, struct xbb_xen_
for (seg_idx = 0, map = xbb->maps; seg_idx < reqlist->nr_segments;
seg_idx++, map++){
-
if (__predict_false(map->status != 0)) {
DPRINTF("invalid buffer -- could not remap "
"it (%d)\n", map->status);
@@ -1760,7 +1751,6 @@ xbb_dispatch_io(struct xbb_softc *xbb, struct xbb_xen_
}
if (reqlist->starting_sector_number + total_sects >
xbb->media_num_sectors) {
-
DPRINTF("%s of [%" PRIu64 ",%" PRIu64 "] "
"extends past end of device %s\n",
operation == BIO_READ ? "read" : "write",
@@ -1831,7 +1821,6 @@ xbb_run_queue(void *context, int pending)
int cur_operation;
struct xbb_xen_reqlist *reqlist;
-
xbb = (struct xbb_softc *)context;
rings = >rings;
@@ -2121,7 +2110,6 @@ xbb_dispatch_dev(struct xbb_softc *xbb, struct xbb_xen
nseg = reqlist->nr_segments;
for (seg_idx = 0; seg_idx < nseg; seg_idx++, xbb_sg++)
svn commit: r365126 - head/sys/dev/bwn
Author: mjg
Date: Tue Sep 1 21:43:48 2020
New Revision: 365126
URL: https://svnweb.freebsd.org/changeset/base/365126
Log:
bwn: clean up empty lines in .c and .h files
Modified:
head/sys/dev/bwn/if_bwn.c
head/sys/dev/bwn/if_bwn_pci.c
head/sys/dev/bwn/if_bwn_pcivar.h
head/sys/dev/bwn/if_bwn_phy_g.c
head/sys/dev/bwn/if_bwnvar.h
Modified: head/sys/dev/bwn/if_bwn.c
==
--- head/sys/dev/bwn/if_bwn.c Tue Sep 1 21:43:36 2020(r365125)
+++ head/sys/dev/bwn/if_bwn.c Tue Sep 1 21:43:48 2020(r365126)
@@ -580,7 +580,7 @@ bwn_attach(device_t dev)
device_printf(sc->sc_dev, "couldn't allocate registers\n");
return (error);
}
-
+
if ((error = bhnd_alloc_pmu(sc->sc_dev))) {
bus_release_resource(sc->sc_dev, SYS_RES_MEMORY,
sc->sc_mem_rid, sc->sc_mem_res);
@@ -685,7 +685,7 @@ fail:
free(mac, M_DEVBUF);
bhnd_release_pmu(dev);
bwn_release_bus_providers(sc);
-
+
if (sc->sc_mem_res != NULL) {
bus_release_resource(sc->sc_dev, SYS_RES_MEMORY,
sc->sc_mem_rid, sc->sc_mem_res);
@@ -1307,7 +1307,6 @@ bwn_attach_core(struct bwn_mac *mac)
have_bg = 1;
have_a = 1;
}
-
#if 0
device_printf(sc->sc_dev, "%s: iost=0x%04hx, have_a=%d, have_bg=%d,"
@@ -3041,7 +3040,7 @@ bwn_dma_32_setdesc(struct bwn_dma_ring *dr,
struct bhnd_dma_translation *dt;
uint32_t addr, addrext, ctl;
int slot;
-
+
descbase = dr->dr_ring_descbase;
dma = >dr_mac->mac_method.dma;
dt = >translation;
@@ -3137,8 +3136,7 @@ bwn_dma_64_setdesc(struct bwn_dma_ring *dr,
uint32_t addrext;
uint32_t ctl0, ctl1;
int slot;
-
-
+
descbase = dr->dr_ring_descbase;
dma = >dr_mac->mac_method.dma;
dt = >translation;
@@ -3686,7 +3684,6 @@ bwn_gpio_control(struct bwn_mac *mac, uint32_t pins)
return (0);
}
-
static int
bwn_gpio_init(struct bwn_mac *mac)
{
@@ -4527,7 +4524,6 @@ bwn_fwinitvals_write(struct bwn_mac *mac, const struct
BWN_WRITE_4(mac, offset, be32toh(iv->data.d32));
iv = GET_NEXTIV32(iv);
} else {
-
if (array_size < sizeof(iv->data.d16))
goto fail;
array_size -= sizeof(iv->data.d16);
@@ -6008,7 +6004,6 @@ bwn_rxeof(struct bwn_mac *mac, struct mbuf *m, const v
break;
}
-
phytype = chanstat & BWN_RX_CHAN_PHYTYPE;
if (macstat & BWN_RX_MAC_FCSERR)
@@ -7171,7 +7166,6 @@ bwn_dma_attach(struct bwn_mac *mac)
mac->mac_dmatype);
return (ENXIO);
}
-
/* Fetch our device->host DMA translation and tag */
error = bhnd_get_dma_translation(sc->sc_dev, addr_width, 0, ,
Modified: head/sys/dev/bwn/if_bwn_pci.c
==
--- head/sys/dev/bwn/if_bwn_pci.c Tue Sep 1 21:43:36 2020
(r365125)
+++ head/sys/dev/bwn/if_bwn_pci.c Tue Sep 1 21:43:48 2020
(r365126)
@@ -90,7 +90,6 @@ static const struct bwn_pci_device siba_devices[] = {
BWN_QUIRK_UNTESTED),
BWN_BCM_DEV(BCM4328_D11G, "BCM4328/4312 802.11g", 0),
-
{ 0, 0, NULL, 0 }
};
@@ -102,7 +101,6 @@ static const struct bwn_pci_device bcma_devices[] = {
BWN_BCM_DEV(BCM43224_D11N, "BCM43224 802.11n Dual-Band", 0),
BWN_BCM_DEV(BCM43224_D11N_ID_VEN1, "BCM43224 802.11n Dual-Band",0),
BWN_BCM_DEV(BCM43225_D11N2G,"BCM43225 802.11n 2GHz",0),
-
{ 0, 0, NULL, 0}
};
Modified: head/sys/dev/bwn/if_bwn_pcivar.h
==
--- head/sys/dev/bwn/if_bwn_pcivar.hTue Sep 1 21:43:36 2020
(r365125)
+++ head/sys/dev/bwn/if_bwn_pcivar.hTue Sep 1 21:43:48 2020
(r365126)
@@ -91,7 +91,6 @@ struct bwn_pci_device {
uint32_tquirks;
};
-
#defineBWN_BCM_DEV(_devid, _desc, _quirks) \
{ PCI_VENDOR_BROADCOM, PCI_DEVID_ ## _devid, \
"Broadcom " _desc " Wireless", _quirks }
Modified: head/sys/dev/bwn/if_bwn_phy_g.c
==
--- head/sys/dev/bwn/if_bwn_phy_g.c Tue Sep 1 21:43:36 2020
(r365125)
+++ head/sys/dev/bwn/if_bwn_phy_g.c Tue Sep 1 21:43:48 2020
(r365126)
@@ -1689,7 +1689,6 @@ bwn_wa_grev1(struct bwn_mac *mac)
bwn_ofdmtab_write_2(mac, BWN_OFDMTAB_AGC2, i,
svn commit: r365127 - head/sys/dev/xilinx
Author: mjg
Date: Tue Sep 1 21:44:42 2020
New Revision: 365127
URL: https://svnweb.freebsd.org/changeset/base/365127
Log:
xilinx: clean up empty lines in .c and .h files
Modified:
head/sys/dev/xilinx/if_xae.c
head/sys/dev/xilinx/xlnx_pcib.c
Modified: head/sys/dev/xilinx/if_xae.c
==
--- head/sys/dev/xilinx/if_xae.cTue Sep 1 21:43:48 2020
(r365126)
+++ head/sys/dev/xilinx/if_xae.cTue Sep 1 21:44:42 2020
(r365127)
@@ -1143,7 +1143,6 @@ static device_method_t xae_methods[] = {
DEVMETHOD(miibus_readreg, xae_miibus_read_reg),
DEVMETHOD(miibus_writereg, xae_miibus_write_reg),
DEVMETHOD(miibus_statchg, xae_miibus_statchg),
-
{ 0, 0 }
};
Modified: head/sys/dev/xilinx/xlnx_pcib.c
==
--- head/sys/dev/xilinx/xlnx_pcib.c Tue Sep 1 21:43:48 2020
(r365126)
+++ head/sys/dev/xilinx/xlnx_pcib.c Tue Sep 1 21:44:42 2020
(r365127)
@@ -596,7 +596,6 @@ xlnx_pcib_msi_alloc_msi(device_t dev, device_t child,
found = false;
for (irq = 0; (irq + count - 1) < XLNX_PCIB_MAX_MSI; irq++) {
-
/* Assume the range is valid. */
found = true;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365122 - head/sys/dev/bge
Author: mjg
Date: Tue Sep 1 21:42:49 2020
New Revision: 365122
URL: https://svnweb.freebsd.org/changeset/base/365122
Log:
bge: clean up empty lines in .c and .h files
Modified:
head/sys/dev/bge/if_bge.c
head/sys/dev/bge/if_bgereg.h
Modified: head/sys/dev/bge/if_bge.c
==
--- head/sys/dev/bge/if_bge.c Tue Sep 1 21:42:38 2020(r365121)
+++ head/sys/dev/bge/if_bge.c Tue Sep 1 21:42:49 2020(r365122)
@@ -240,7 +240,6 @@ static const struct bge_type {
{ FJTSU_VENDORID, FJTSU_DEVICEID_PW008GE4 },
{ FJTSU_VENDORID, FJTSU_DEVICEID_PW008GE5 },
{ FJTSU_VENDORID, FJTSU_DEVICEID_PP250450 },
-
{ 0, 0 }
};
@@ -255,7 +254,6 @@ static const struct bge_vendor {
{ SK_VENDORID, "SysKonnect" },
{ TC_VENDORID, "3Com" },
{ FJTSU_VENDORID, "Fujitsu" },
-
{ 0, NULL }
};
@@ -330,7 +328,6 @@ static const struct bge_revision {
{ BGE_CHIPID_BCM57765_B0, "BCM57765 B0" },
{ BGE_CHIPID_BCM57780_A0, "BCM57780 A0" },
{ BGE_CHIPID_BCM57780_A1, "BCM57780 A1" },
-
{ 0, NULL }
};
@@ -363,7 +360,6 @@ static const struct bge_revision bge_majorrevs[] = {
{ BGE_ASICREV_BCM5719, "unknown BCM5719" },
{ BGE_ASICREV_BCM5720, "unknown BCM5720" },
{ BGE_ASICREV_BCM5762, "unknown BCM5762" },
-
{ 0, NULL }
};
Modified: head/sys/dev/bge/if_bgereg.h
==
--- head/sys/dev/bge/if_bgereg.hTue Sep 1 21:42:38 2020
(r365121)
+++ head/sys/dev/bge/if_bgereg.hTue Sep 1 21:42:49 2020
(r365122)
@@ -145,7 +145,6 @@
#defineBGE_EXT_SSRAM 0x0002
#defineBGE_EXT_SSRAM_END 0x000F
-
/*
* BCM570x register offsets. These are memory mapped registers
* which can be accessed with the CSR_READ_4()/CSR_WRITE_4() macros.
@@ -462,7 +461,6 @@
#defineBGE_PCICLOCKCTL_SYSPLL_DISABLE 0x8000
#defineBGE_PCICLOCKCTL_BIST_ENABLE 0x0001
-
#ifndef PCIM_CMD_MWIEN
#definePCIM_CMD_MWIEN 0x0010
#endif
@@ -902,7 +900,6 @@
#defineBGE_SGDIGSTS_PAUSE_CAP 0x0008
#defineBGE_SGDIGSTS_ASYM_PAUSE 0x0010
-
/* MI communication register */
#defineBGE_MICOMM_DATA 0x
#defineBGE_MICOMM_REG 0x001F
@@ -927,7 +924,6 @@
#defineBGE_MIMODE_500KHZ_CONST 0x8000
#defineBGE_MIMODE_BASE 0x000C
-
/*
* Send data initiator control registers.
*/
@@ -1157,7 +1153,6 @@
#defineBGE_RXLP_LOCSTAT_IFIN_ERRORS0x2254
#defineBGE_RXLP_LOCSTAT_RXTHRESH_HIT 0x2258
-
/* Receive List Placement mode register */
#defineBGE_RXLPMODE_RESET 0x0001
#defineBGE_RXLPMODE_ENABLE 0x0002
@@ -1208,7 +1203,6 @@
#defineBGE_RDBDI_RETURN_PROD15 0x24BC
#defineBGE_RDBDI_HWDIAG0x24C0
-
/* Receive Data and Receive BD Initiator Mode register */
#defineBGE_RDBDIMODE_RESET 0x0001
#defineBGE_RDBDIMODE_ENABLE0x0002
@@ -1221,7 +1215,6 @@
#defineBGE_RDBDISTAT_GIANT_ATTN0x0008
#defineBGE_RDBDISTAT_BADRINGSZ_ATTN0x0010
-
/*
* Receive Data Completion Control registers
*/
@@ -1410,7 +1403,6 @@
#defineBGE_HCC_TX_BD_CONS140x3CF8
#defineBGE_HCC_TX_BD_CONS150x3CFC
-
/* Host coalescing mode register */
#defineBGE_HCCMODE_RESET 0x0001
#defineBGE_HCCMODE_ENABLE 0x0002
@@ -1544,7 +1536,6 @@
#defineBGE_BMANSTAT_ERRO 0x0004
#defineBGE_BMANSTAT_LOWMBUF_ERROR 0x0010
-
/*
* Read DMA Control registers
*/
@@ -1652,7 +1643,6 @@
#defineBGE_WDMASTAT_PCI_FIFOOREAD_ATTN 0x0100
#defineBGE_WDMASTAT_LOCREAD_TOOBIG 0x0200
-
/*
* RX CPU registers
*/
@@ -1748,7 +1738,6 @@
#defineBGE_TXCPUSTAT_MA_REQ_FIFOOFLOW 0x4000
#defineBGE_TXCPUSTAT_BLOCKING_READ 0x8000
-
/*
* Low priority mailbox registers
*/
@@ -1924,7 +1913,6 @@
#defineBGE_MSISTAT_MSI_FIFOUFLOW_ATTN 0x0020
#defineBGE_MSISTAT_MSI_FIFOOFLOW_ATTN 0x0040
-
/*
* DMA Completion registers
*/
@@ -1934,7 +1922,6 @@
#defineBGE_DMACMODE_RESET 0x0001
#defineBGE_DMACMODE_ENABLE 0x0002
-
/*
* General control registers.
*/
@@ -2427,7 +2414,6 @@ struct bge_status_block {
#defineBGE_STATFLAG_LINKSTATE_CHANGED 0x0002
#defineBGE_STATFLAG_ERROR 0x0004
-
/*
* Broadcom
svn commit: r365123 - in head/sys/dev/bhnd: . bcma bhndb cores/chipc cores/chipc/pwrctl cores/pci cores/pcie2 cores/pmu cores/usb nvram siba
Author: mjg
Date: Tue Sep 1 21:43:05 2020
New Revision: 365123
URL: https://svnweb.freebsd.org/changeset/base/365123
Log:
bhnd: clean up empty lines in .c and .h files
Modified:
head/sys/dev/bhnd/bcma/bcma.c
head/sys/dev/bhnd/bcma/bcma_bhndb.c
head/sys/dev/bhnd/bcma/bcma_dmp.h
head/sys/dev/bhnd/bcma/bcma_erom.c
head/sys/dev/bhnd/bcma/bcma_eromreg.h
head/sys/dev/bhnd/bcma/bcma_subr.c
head/sys/dev/bhnd/bcma/bcmavar.h
head/sys/dev/bhnd/bhnd.c
head/sys/dev/bhnd/bhnd.h
head/sys/dev/bhnd/bhnd_debug.h
head/sys/dev/bhnd/bhnd_erom.c
head/sys/dev/bhnd/bhnd_erom.h
head/sys/dev/bhnd/bhnd_eromvar.h
head/sys/dev/bhnd/bhnd_ids.h
head/sys/dev/bhnd/bhnd_match.h
head/sys/dev/bhnd/bhnd_private.h
head/sys/dev/bhnd/bhnd_subr.c
head/sys/dev/bhnd/bhnd_types.h
head/sys/dev/bhnd/bhndb/bhnd_bhndb.c
head/sys/dev/bhnd/bhndb/bhndb.c
head/sys/dev/bhnd/bhndb/bhndb.h
head/sys/dev/bhnd/bhndb/bhndb_hwdata.h
head/sys/dev/bhnd/bhndb/bhndb_pci.c
head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.c
head/sys/dev/bhnd/bhndb/bhndb_pci_hwdata.h
head/sys/dev/bhnd/bhndb/bhndb_pci_sprom.c
head/sys/dev/bhnd/bhndb/bhndb_pcireg.h
head/sys/dev/bhnd/bhndb/bhndb_private.h
head/sys/dev/bhnd/bhndb/bhndb_subr.c
head/sys/dev/bhnd/cores/chipc/chipc.c
head/sys/dev/bhnd/cores/chipc/chipc_cfi.c
head/sys/dev/bhnd/cores/chipc/chipc_gpio.c
head/sys/dev/bhnd/cores/chipc/chipc_subr.c
head/sys/dev/bhnd/cores/chipc/chipcreg.h
head/sys/dev/bhnd/cores/chipc/chipcvar.h
head/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.c
head/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_subr.c
head/sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctlvar.h
head/sys/dev/bhnd/cores/pci/bhnd_pci.c
head/sys/dev/bhnd/cores/pci/bhnd_pci_hostb.c
head/sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h
head/sys/dev/bhnd/cores/pci/bhnd_pcireg.h
head/sys/dev/bhnd/cores/pci/bhnd_pcivar.h
head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2.c
head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c
head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h
head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_reg.h
head/sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h
head/sys/dev/bhnd/cores/pmu/bhnd_pmu.c
head/sys/dev/bhnd/cores/pmu/bhnd_pmu.h
head/sys/dev/bhnd/cores/pmu/bhnd_pmu_core.c
head/sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h
head/sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c
head/sys/dev/bhnd/cores/pmu/bhnd_pmureg.h
head/sys/dev/bhnd/cores/usb/bhnd_ehci.c
head/sys/dev/bhnd/cores/usb/bhnd_usb.c
head/sys/dev/bhnd/nvram/bhnd_nvram.h
head/sys/dev/bhnd/nvram/bhnd_nvram_data.c
head/sys/dev/bhnd/nvram/bhnd_nvram_data_bcm.c
head/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmvar.h
head/sys/dev/bhnd/nvram/bhnd_nvram_data_btxt.c
head/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c
head/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom_subr.c
head/sys/dev/bhnd/nvram/bhnd_nvram_data_spromvar.h
head/sys/dev/bhnd/nvram/bhnd_nvram_data_tlv.c
head/sys/dev/bhnd/nvram/bhnd_nvram_io.c
head/sys/dev/bhnd/nvram/bhnd_nvram_iobuf.c
head/sys/dev/bhnd/nvram/bhnd_nvram_ioptr.c
head/sys/dev/bhnd/nvram/bhnd_nvram_iores.c
head/sys/dev/bhnd/nvram/bhnd_nvram_store.c
head/sys/dev/bhnd/nvram/bhnd_nvram_subr.c
head/sys/dev/bhnd/nvram/bhnd_nvram_value.c
head/sys/dev/bhnd/nvram/bhnd_nvram_value.h
head/sys/dev/bhnd/nvram/bhnd_nvram_value_fmts.c
head/sys/dev/bhnd/nvram/bhnd_nvram_value_prf.c
head/sys/dev/bhnd/nvram/bhnd_nvram_value_subr.c
head/sys/dev/bhnd/nvram/bhnd_sprom.c
head/sys/dev/bhnd/siba/siba.c
head/sys/dev/bhnd/siba/siba_bhndb.c
head/sys/dev/bhnd/siba/siba_erom.c
head/sys/dev/bhnd/siba/siba_subr.c
head/sys/dev/bhnd/siba/sibareg.h
head/sys/dev/bhnd/siba/sibavar.h
Modified: head/sys/dev/bhnd/bcma/bcma.c
==
--- head/sys/dev/bhnd/bcma/bcma.c Tue Sep 1 21:42:49 2020
(r365122)
+++ head/sys/dev/bhnd/bcma/bcma.c Tue Sep 1 21:43:05 2020
(r365123)
@@ -140,10 +140,10 @@ bcma_read_ivar(device_t dev, device_t child, int index
{
const struct bcma_devinfo *dinfo;
const struct bhnd_core_info *ci;
-
+
dinfo = device_get_ivars(child);
ci = >corecfg->core_info;
-
+
switch (index) {
case BHND_IVAR_VENDOR:
*result = ci->vendor;
@@ -500,7 +500,7 @@ bcma_get_region_count(device_t dev, device_t child, bh
dinfo = device_get_ivars(child);
ports = bcma_corecfg_get_port_list(dinfo->corecfg, type);
-
+
STAILQ_FOREACH(port, ports, sp_link) {
if (port->sp_num == port_num)
return (port->sp_num_maps);
@@ -518,7 +518,7 @@ bcma_get_port_rid(device_t dev, device_t child, bhnd_p
struct bcma_map *map;
struct bcma_sport_list *ports;
struct bcma_sport *port;
-
+
dinfo = device_get_ivars(child);
ports = bcma_corecfg_get_port_list(dinfo->corecfg, port_type);
@@ -584,7 +584,7 @@
svn commit: r365124 - head/sys/dev/bnxt
Author: mjg
Date: Tue Sep 1 21:43:23 2020
New Revision: 365124
URL: https://svnweb.freebsd.org/changeset/base/365124
Log:
bnxt: clean up empty lines in .c and .h files
Modified:
head/sys/dev/bnxt/bnxt.h
head/sys/dev/bnxt/bnxt_hwrm.c
head/sys/dev/bnxt/bnxt_sysctl.c
head/sys/dev/bnxt/if_bnxt.c
Modified: head/sys/dev/bnxt/bnxt.h
==
--- head/sys/dev/bnxt/bnxt.hTue Sep 1 21:43:05 2020(r365123)
+++ head/sys/dev/bnxt/bnxt.hTue Sep 1 21:43:23 2020(r365124)
@@ -413,7 +413,6 @@ struct bnxt_vf_info {
bus_addr_t hwrm_cmd_req_dma_addr;
};
-
#define BNXT_PF(softc) (!((softc)->flags & BNXT_FLAG_VF))
#define BNXT_VF(softc) ((softc)->flags & BNXT_FLAG_VF)
Modified: head/sys/dev/bnxt/bnxt_hwrm.c
==
--- head/sys/dev/bnxt/bnxt_hwrm.c Tue Sep 1 21:43:05 2020
(r365123)
+++ head/sys/dev/bnxt/bnxt_hwrm.c Tue Sep 1 21:43:23 2020
(r365124)
@@ -263,7 +263,6 @@ qportcfg_exit:
return (rc);
}
-
int
bnxt_hwrm_ver_get(struct bnxt_softc *softc)
{
@@ -377,7 +376,6 @@ bnxt_hwrm_func_drv_rgtr(struct bnxt_softc *softc)
return hwrm_send_message(softc, , sizeof(req));
}
-
int
bnxt_hwrm_func_drv_unrgtr(struct bnxt_softc *softc, bool shutdown)
{
@@ -390,7 +388,6 @@ bnxt_hwrm_func_drv_unrgtr(struct bnxt_softc *softc, bo
return hwrm_send_message(softc, , sizeof(req));
}
-
static inline int
_is_valid_ether_addr(uint8_t *addr)
{
@@ -529,7 +526,6 @@ bnxt_hwrm_set_link_common(struct bnxt_softc *softc,
req->flags |= htole32(HWRM_PORT_PHY_CFG_INPUT_FLAGS_RESET_PHY);
}
-
static void
bnxt_hwrm_set_pause_common(struct bnxt_softc *softc,
struct hwrm_port_phy_cfg_input *req)
@@ -559,7 +555,6 @@ bnxt_hwrm_set_pause_common(struct bnxt_softc *softc,
}
}
-
/* JFV this needs interface connection */
static void
bnxt_hwrm_set_eee(struct bnxt_softc *softc, struct hwrm_port_phy_cfg_input
*req)
@@ -586,7 +581,6 @@ bnxt_hwrm_set_eee(struct bnxt_softc *softc, struct hwr
}
}
-
int
bnxt_hwrm_set_link_setting(struct bnxt_softc *softc, bool set_pause,
bool set_eee, bool set_link)
@@ -598,7 +592,7 @@ bnxt_hwrm_set_link_setting(struct bnxt_softc *softc, b
return ENOTSUP;
bnxt_hwrm_cmd_hdr_init(softc, , HWRM_PORT_PHY_CFG);
-
+
if (set_pause) {
bnxt_hwrm_set_pause_common(softc, );
@@ -608,10 +602,10 @@ bnxt_hwrm_set_link_setting(struct bnxt_softc *softc, b
if (set_link)
bnxt_hwrm_set_link_common(softc, );
-
+
if (set_eee)
bnxt_hwrm_set_eee(softc, );
-
+
BNXT_HWRM_LOCK(softc);
rc = _hwrm_send_message(softc, , sizeof(req));
@@ -905,7 +899,6 @@ bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt_softc *softc,
return hwrm_send_message(softc, , sizeof(req));
}
-
int
bnxt_hwrm_set_filter(struct bnxt_softc *softc, struct bnxt_vnic_info *vnic)
{
@@ -966,7 +959,7 @@ int
bnxt_cfg_async_cr(struct bnxt_softc *softc)
{
int rc = 0;
-
+
if (BNXT_PF(softc)) {
struct hwrm_func_cfg_input req = {0};
@@ -1569,7 +1562,7 @@ bnxt_hwrm_port_phy_qcfg(struct bnxt_softc *softc)
* 3. When the auto_mode is set to none and this flag is set to 1,
*auto_pause bits should be ignored and should be set to 0.
*/
-
+
link_info->flow_ctrl.autoneg = false;
link_info->flow_ctrl.tx = false;
link_info->flow_ctrl.rx = false;
@@ -1697,7 +1690,6 @@ static void bnxt_hwrm_set_coal_params(struct bnxt_soft
req->num_cmpl_aggr_int = htole16((uint16_t)max_frames * 4);
}
-
int bnxt_hwrm_set_coal(struct bnxt_softc *softc)
{
int i, rc = 0;
@@ -1749,7 +1741,6 @@ int bnxt_hwrm_set_coal(struct bnxt_softc *softc)
buf_tmr_irq << 16 | buf_tmr, flags, _tx);
for (i = 0; i < softc->nrxqsets; i++) {
-
req = _rx;
/*
@@ -1767,8 +1758,6 @@ int bnxt_hwrm_set_coal(struct bnxt_softc *softc)
}
return rc;
}
-
-
int bnxt_hwrm_func_rgtr_async_events(struct bnxt_softc *softc, unsigned long
*bmap,
int bmap_size)
Modified: head/sys/dev/bnxt/bnxt_sysctl.c
==
--- head/sys/dev/bnxt/bnxt_sysctl.c Tue Sep 1 21:43:05 2020
(r365123)
+++ head/sys/dev/bnxt/bnxt_sysctl.c Tue Sep 1 21:43:23 2020
(r365124)
@@ -173,7 +173,6 @@ bnxt_create_tx_sysctls(struct bnxt_softc *softc, int t
if (!oid)
return ENOMEM;
-
SYSCTL_ADD_QUAD(>hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
"ucast_pkts", CTLFLAG_RD, _stats[txr].tx_ucast_pkts,
"unicast packets
svn commit: r365125 - head/sys/dev/bwi
Author: mjg
Date: Tue Sep 1 21:43:36 2020
New Revision: 365125
URL: https://svnweb.freebsd.org/changeset/base/365125
Log:
bwi: clean up empty lines in .c and .h files
Modified:
head/sys/dev/bwi/bwimac.c
head/sys/dev/bwi/bwiphy.c
head/sys/dev/bwi/bwirf.c
head/sys/dev/bwi/if_bwi.c
head/sys/dev/bwi/if_bwi_pci.c
head/sys/dev/bwi/if_bwireg.h
Modified: head/sys/dev/bwi/bwimac.c
==
--- head/sys/dev/bwi/bwimac.c Tue Sep 1 21:43:23 2020(r365124)
+++ head/sys/dev/bwi/bwimac.c Tue Sep 1 21:43:36 2020(r365125)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
#include
#include
-
+
#include
#include
#include
Modified: head/sys/dev/bwi/bwiphy.c
==
--- head/sys/dev/bwi/bwiphy.c Tue Sep 1 21:43:23 2020(r365124)
+++ head/sys/dev/bwi/bwiphy.c Tue Sep 1 21:43:36 2020(r365125)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-
+
#include
#include
#include
@@ -88,7 +88,6 @@ static void bwi_phy_config_agc(struct bwi_mac *);
static voidbwi_tbl_write_2(struct bwi_mac *mac, uint16_t, uint16_t);
static voidbwi_tbl_write_4(struct bwi_mac *mac, uint16_t, uint32_t);
-
#define SUP_BPHY(num) { .rev = num, .init = bwi_phy_init_11b_rev##num }
static const struct {
Modified: head/sys/dev/bwi/bwirf.c
==
--- head/sys/dev/bwi/bwirf.cTue Sep 1 21:43:23 2020(r365124)
+++ head/sys/dev/bwi/bwirf.cTue Sep 1 21:43:36 2020(r365125)
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-
+
#include
#include
#include
Modified: head/sys/dev/bwi/if_bwi.c
==
--- head/sys/dev/bwi/if_bwi.c Tue Sep 1 21:43:23 2020(r365124)
+++ head/sys/dev/bwi/if_bwi.c Tue Sep 1 21:43:36 2020(r365125)
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-
+
#include
#include
#include
Modified: head/sys/dev/bwi/if_bwi_pci.c
==
--- head/sys/dev/bwi/if_bwi_pci.c Tue Sep 1 21:43:23 2020
(r365124)
+++ head/sys/dev/bwi/if_bwi_pci.c Tue Sep 1 21:43:36 2020
(r365125)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#include
#include
-
+
#include
#include
#include
@@ -246,7 +246,6 @@ static device_method_t bwi_pci_methods[] = {
DEVMETHOD(device_shutdown, bwi_pci_shutdown),
DEVMETHOD(device_suspend, bwi_pci_suspend),
DEVMETHOD(device_resume,bwi_pci_resume),
-
{ 0,0 }
};
static driver_t bwi_driver = {
Modified: head/sys/dev/bwi/if_bwireg.h
==
--- head/sys/dev/bwi/if_bwireg.hTue Sep 1 21:43:23 2020
(r365124)
+++ head/sys/dev/bwi/if_bwireg.hTue Sep 1 21:43:36 2020
(r365125)
@@ -77,7 +77,6 @@
#define BWI_CONF_LO_REQTO_MASK __BITS(6, 4)/* request timeout */
#define BWI_CONF_LO_REQTO 3
-
#define BWI_ID_LO 0xff8
#define BWI_ID_LO_BUSREV_MASK __BITS(31, 28)
/* Bus revision */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365118 - head/sys/dev/axgbe
Author: mjg
Date: Tue Sep 1 21:41:55 2020
New Revision: 365118
URL: https://svnweb.freebsd.org/changeset/base/365118
Log:
axgbe: clean up empty lines in .c and .h files
Modified:
head/sys/dev/axgbe/if_axgbe.c
Modified: head/sys/dev/axgbe/if_axgbe.c
==
--- head/sys/dev/axgbe/if_axgbe.c Tue Sep 1 21:41:38 2020
(r365117)
+++ head/sys/dev/axgbe/if_axgbe.c Tue Sep 1 21:41:55 2020
(r365118)
@@ -391,7 +391,6 @@ axgbe_attach(device_t dev)
sc->prv.phy.advertising = ADVERTISED_1baseKR_Full |
ADVERTISED_1000baseKX_Full;
-
/*
* Read the needed properties from the phy node.
*/
@@ -563,7 +562,6 @@ static device_method_t axgbe_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, axgbe_probe),
DEVMETHOD(device_attach,axgbe_attach),
-
{ 0, 0 }
};
@@ -573,7 +571,6 @@ DEFINE_CLASS_0(axgbe, axgbe_driver, axgbe_methods,
sizeof(struct axgbe_softc));
DRIVER_MODULE(axgbe, simplebus, axgbe_driver, axgbe_devclass, 0, 0);
-
static struct ofw_compat_data phy_compat_data[] = {
{ "amd,xgbe-phy-seattle-v1a", true },
{ NULL, false }
@@ -608,7 +605,6 @@ static device_method_t axgbephy_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, axgbephy_probe),
DEVMETHOD(device_attach,axgbephy_attach),
-
{ 0, 0 }
};
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365119 - head/sys/dev/bce
Author: mjg
Date: Tue Sep 1 21:42:08 2020
New Revision: 365119
URL: https://svnweb.freebsd.org/changeset/base/365119
Log:
bce: clean up empty lines in .c and .h files
Modified:
head/sys/dev/bce/if_bce.c
head/sys/dev/bce/if_bcefw.h
head/sys/dev/bce/if_bcereg.h
Modified: head/sys/dev/bce/if_bce.c
==
--- head/sys/dev/bce/if_bce.c Tue Sep 1 21:41:55 2020(r365118)
+++ head/sys/dev/bce/if_bce.c Tue Sep 1 21:42:08 2020(r365119)
@@ -199,11 +199,9 @@ static const struct bce_type bce_devs[] = {
/* BCM5716 controllers and OEM boards. */
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5716, PCI_ANY_ID, PCI_ANY_ID,
"QLogic NetXtreme II BCM5716 1000Base-T" },
-
{ 0, 0, 0, 0, NULL }
};
-
//
/* Supported Flash NVRAM device data. */
//
@@ -313,7 +311,6 @@ static const struct flash_spec flash_5709 = {
.name = "5709/5716 buffered flash (256kB)",
};
-
//
/* FreeBSD device entry points. */
//
@@ -322,7 +319,6 @@ static int bce_attach (device_t);
static int bce_detach (device_t);
static int bce_shutdown (device_t);
-
//
/* BCE Debug Data Structure Dump Routines */
//
@@ -365,7 +361,6 @@ static void bce_dump_rv2p_state (struct bce_softc *);
static void bce_breakpoint (struct bce_softc *);
#endif /*BCE_DEBUG */
-
//
/* BCE Register/Memory Access Routines */
//
@@ -488,7 +483,6 @@ static void bce_tick(void
*);
static void bce_pulse (void *);
static void bce_add_sysctls(struct bce_softc *);
-
//
/* FreeBSD device dispatch table. */
//
@@ -667,7 +661,6 @@ static int bce_rx_ticks = DEFAULT_RX_TICKS;
SYSCTL_UINT(_hw_bce, OID_AUTO, rx_ticks, CTLFLAG_RDTUN,
_rx_ticks, 0, "Receive ticks count");
-
//
/* Device probe function. */
/* */
@@ -703,11 +696,9 @@ bce_probe(device_t dev)
/* Look through the list of known devices for a match. */
while(t->bce_name != NULL) {
-
if ((vid == t->bce_vid) && (did == t->bce_did) &&
((svid == t->bce_svid) || (t->bce_svid == PCI_ANY_ID)) &&
((sdid == t->bce_sdid) || (t->bce_sdid == PCI_ANY_ID))) {
-
descbuf = malloc(BCE_DEVDESC_MAX, M_TEMP, M_NOWAIT);
if (descbuf == NULL)
@@ -729,7 +720,6 @@ bce_probe(device_t dev)
return(ENXIO);
}
-
//
/* PCI Capabilities Probe Function. */
/* */
@@ -751,7 +741,6 @@ bce_print_adapter_info(struct bce_softc *sc)
printf("Rev (%c%d); ", ((BCE_CHIP_ID(sc) & 0xf000) >>
12) + 'A', ((BCE_CHIP_ID(sc) & 0x0ff0) >> 4));
-
/* Bus info. */
if (sc->bce_flags & BCE_PCIE_FLAG) {
printf("Bus (PCIe x%d, ", sc->link_width);
@@ -815,13 +804,11 @@ bce_print_adapter_info(struct bce_softc *sc)
sc->bce_tx_quick_cons_trip,
sc->bce_tx_ticks_int,
sc->bce_tx_ticks);
-
}
DBEXIT(BCE_VERBOSE_LOAD);
}
-
//
/* PCI Capabilities Probe Function. */
/* */
@@ -872,7 +859,6 @@ bce_probe_pci_caps(device_t dev, struct bce_softc *sc)
DBEXIT(BCE_VERBOSE_LOAD);
}
-
//
/*
svn commit: r365121 - head/sys/dev/bfe
Author: mjg
Date: Tue Sep 1 21:42:38 2020
New Revision: 365121
URL: https://svnweb.freebsd.org/changeset/base/365121
Log:
bfe: clean up empty lines in .c and .h files
Modified:
head/sys/dev/bfe/if_bfe.c
head/sys/dev/bfe/if_bfereg.h
Modified: head/sys/dev/bfe/if_bfe.c
==
--- head/sys/dev/bfe/if_bfe.c Tue Sep 1 21:42:21 2020(r365120)
+++ head/sys/dev/bfe/if_bfe.c Tue Sep 1 21:42:38 2020(r365121)
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-
#include
__FBSDID("$FreeBSD$");
@@ -823,7 +822,7 @@ bfe_list_newbuf(struct bfe_softc *sc, int c)
rx_header->len = 0;
rx_header->flags = 0;
bus_dmamap_sync(sc->bfe_rxmbuf_tag, r->bfe_map, BUS_DMASYNC_PREREAD);
-
+
ctrl = segs[0].ds_len & BFE_DESC_LEN;
KASSERT(ctrl > ETHER_MAX_LEN + 32, ("%s: buffer size too small(%d)!",
__func__, ctrl));
@@ -1110,7 +1109,6 @@ bfe_set_rx_mode(struct bfe_softc *sc)
else
val |= BFE_RXCONF_DBCAST;
-
CSR_WRITE_4(sc, BFE_CAM_CTRL, 0);
bfe_cam_write(sc, IF_LLADDR(sc->bfe_ifp), 0);
@@ -1481,7 +1479,6 @@ bfe_intr(void *xsc)
bfe_txeof(sc);
if (istat & BFE_ISTAT_ERRORS) {
-
if (istat & BFE_ISTAT_DSCE) {
device_printf(sc->bfe_dev, "Descriptor Error\n");
bfe_stop(sc);
Modified: head/sys/dev/bfe/if_bfereg.h
==
--- head/sys/dev/bfe/if_bfereg.hTue Sep 1 21:42:21 2020
(r365120)
+++ head/sys/dev/bfe/if_bfereg.hTue Sep 1 21:42:38 2020
(r365121)
@@ -248,7 +248,6 @@
#define BFE_IBE 0x0002 /* In Band Error */
#define BFE_TO 0x0004 /* Timeout */
-
/* Seems the bcm440x has a fairly generic core, we only need be concerned with
* a couple of these
*/
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365120 - in head/sys/dev/beri/virtio: . network
Author: mjg
Date: Tue Sep 1 21:42:21 2020
New Revision: 365120
URL: https://svnweb.freebsd.org/changeset/base/365120
Log:
beri: clean up empty lines in .c and .h files
Modified:
head/sys/dev/beri/virtio/network/if_vtbe.c
head/sys/dev/beri/virtio/virtio.c
head/sys/dev/beri/virtio/virtio_block.c
Modified: head/sys/dev/beri/virtio/network/if_vtbe.c
==
--- head/sys/dev/beri/virtio/network/if_vtbe.c Tue Sep 1 21:42:08 2020
(r365119)
+++ head/sys/dev/beri/virtio/network/if_vtbe.c Tue Sep 1 21:42:21 2020
(r365120)
@@ -635,7 +635,6 @@ vtbe_attach(device_t dev)
static device_method_t vtbe_methods[] = {
DEVMETHOD(device_probe, vtbe_probe),
DEVMETHOD(device_attach,vtbe_attach),
-
{ 0, 0 }
};
Modified: head/sys/dev/beri/virtio/virtio.c
==
--- head/sys/dev/beri/virtio/virtio.c Tue Sep 1 21:42:08 2020
(r365119)
+++ head/sys/dev/beri/virtio/virtio.c Tue Sep 1 21:42:21 2020
(r365120)
@@ -109,7 +109,6 @@ paddr_unmap(void *phys, uint32_t size)
static inline void
_vq_record(uint32_t offs, int i, volatile struct vring_desc *vd,
struct iovec *iov, int n_iov, uint16_t *flags) {
-
if (i >= n_iov)
return;
Modified: head/sys/dev/beri/virtio/virtio_block.c
==
--- head/sys/dev/beri/virtio/virtio_block.c Tue Sep 1 21:42:08 2020
(r365119)
+++ head/sys/dev/beri/virtio/virtio_block.c Tue Sep 1 21:42:21 2020
(r365120)
@@ -347,7 +347,6 @@ vq_init(struct beri_vtblk_softc *sc)
return (0);
}
-
static void
vtblk_thread(void *arg)
{
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365117 - head/sys/dev/atkbdc
Author: mjg
Date: Tue Sep 1 21:41:38 2020
New Revision: 365117
URL: https://svnweb.freebsd.org/changeset/base/365117
Log:
atkbdc: clean up empty lines in .c and .h files
Modified:
head/sys/dev/atkbdc/atkbd.c
head/sys/dev/atkbdc/atkbdc.c
head/sys/dev/atkbdc/atkbdc_isa.c
head/sys/dev/atkbdc/psm.c
Modified: head/sys/dev/atkbdc/atkbd.c
==
--- head/sys/dev/atkbdc/atkbd.c Tue Sep 1 21:41:07 2020(r365116)
+++ head/sys/dev/atkbdc/atkbd.c Tue Sep 1 21:41:38 2020(r365117)
@@ -314,7 +314,7 @@ atkbd_configure(int flags)
}
return 0;
}
-
+
/* XXX: a kludge to obtain the device configuration flags */
if (resource_int_value("atkbd", ATKBD_DEFAULT, "flags", ) == 0)
flags |= i;
@@ -427,7 +427,7 @@ atkbd_init(int unit, keyboard_t **kbdp, void *arg, int
imin(fkeymap_size * sizeof(fkeymap[0]), sizeof(fkey_tab)));
kbd_set_maps(kbd, keymap, accmap, fkeymap, fkeymap_size);
kbd->kb_data = (void *)state;
-
+
if (probe_keyboard(state->kbdc, flags)) { /* shouldn't happen */
if (flags & KB_CONF_FAIL_IF_NO_KBD) {
error = ENXIO;
@@ -928,7 +928,6 @@ atkbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
s = spltty();
switch (cmd) {
-
case KDGKBMODE: /* get keyboard mode */
*(int *)arg = state->ks_mode;
break;
@@ -1386,7 +1385,7 @@ init_keyboard(KBDC kbdc, int *type, int flags)
if (bootverbose)
printf("atkbd: scancode set %d\n", codeset);
#endif /* KBD_DETECT_XT_KEYBOARD */
-
+
*type = KB_OTHER;
id = get_kbd_id(kbdc);
switch(id) {
Modified: head/sys/dev/atkbdc/atkbdc.c
==
--- head/sys/dev/atkbdc/atkbdc.cTue Sep 1 21:41:07 2020
(r365116)
+++ head/sys/dev/atkbdc/atkbdc.cTue Sep 1 21:41:38 2020
(r365117)
@@ -116,7 +116,6 @@ static struct atkbdc_quirks quirks[] = {
{"coreboot", NULL, NULL,
KBDC_QUIRK_KEEP_ACTIVATED | KBDC_QUIRK_IGNORE_PROBE_RESULT |
KBDC_QUIRK_RESET_AFTER_PROBE | KBDC_QUIRK_SETLEDS_ON_INIT},
-
{NULL, NULL, NULL, 0}
};
Modified: head/sys/dev/atkbdc/atkbdc_isa.c
==
--- head/sys/dev/atkbdc/atkbdc_isa.cTue Sep 1 21:41:07 2020
(r365116)
+++ head/sys/dev/atkbdc/atkbdc_isa.cTue Sep 1 21:41:38 2020
(r365117)
@@ -77,7 +77,6 @@ static device_method_t atkbdc_isa_methods[] = {
DEVMETHOD(bus_delete_resource, bus_generic_rl_delete_resource),
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr,bus_generic_teardown_intr),
-
{ 0, 0 }
};
@@ -300,7 +299,7 @@ atkbdc_isa_alloc_resource(device_t dev, device_t child
rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
{
atkbdc_softc_t *sc;
-
+
sc = *(atkbdc_softc_t **)device_get_softc(dev);
if (type == SYS_RES_IRQ && *rid == KBDC_RID_KBD && sc->irq != NULL)
return (sc->irq);
@@ -313,7 +312,7 @@ atkbdc_isa_release_resource(device_t dev, device_t chi
struct resource *r)
{
atkbdc_softc_t *sc;
-
+
sc = *(atkbdc_softc_t **)device_get_softc(dev);
if (type == SYS_RES_IRQ && rid == KBDC_RID_KBD && r == sc->irq)
return (0);
Modified: head/sys/dev/atkbdc/psm.c
==
--- head/sys/dev/atkbdc/psm.c Tue Sep 1 21:41:07 2020(r365116)
+++ head/sys/dev/atkbdc/psm.c Tue Sep 1 21:41:38 2020(r365117)
@@ -727,7 +727,6 @@ static device_method_t psm_methods[] = {
DEVMETHOD(device_attach,psmattach),
DEVMETHOD(device_detach,psmdetach),
DEVMETHOD(device_resume,psmresume),
-
{ 0, 0 }
};
@@ -1691,7 +1690,6 @@ psmprobe(device_t dev)
#definePS2_MOUSE_ELANTECH_NAME "ETPS/2 Elantech Touchpad"
#definePS2_MOUSE_ELANTECH_ST_NAME "ETPS/2 Elantech TrackPoint"
#definePS2_MOUSE_ELANTECH_PRODUCT 0x000E
-
#defineABSINFO_END { ABS_CNT, 0, 0, 0 }
static void
@@ -2629,7 +2627,6 @@ psmioctl(struct cdev *dev, u_long cmd, caddr_t addr, i
/* Perform IOCTL command */
switch (cmd) {
-
case OLD_MOUSE_GETHWINFO:
s = spltty();
((old_mousehw_t *)addr)->buttons = sc->hw.buttons;
@@ -4716,7 +4713,6 @@ proc_elantech(struct psm_softc *sc, packetbuf_t *pb, m
!(pb->ipacket[0] & 0x10) != !(pb->ipacket[3] & 0x10) &&
!(pb->ipacket[0] & 0x20) != !(pb->ipacket[2] & 0x80) &&
svn commit: r365115 - in head/sys/dev/ata: . chipsets
Author: mjg
Date: Tue Sep 1 21:40:47 2020
New Revision: 365115
URL: https://svnweb.freebsd.org/changeset/base/365115
Log:
ata: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ata/ata-all.h
head/sys/dev/ata/ata-isa.c
head/sys/dev/ata/ata-lowlevel.c
head/sys/dev/ata/ata-pci.c
head/sys/dev/ata/chipsets/ata-cypress.c
head/sys/dev/ata/chipsets/ata-cyrix.c
head/sys/dev/ata/chipsets/ata-fsl.c
head/sys/dev/ata/chipsets/ata-highpoint.c
head/sys/dev/ata/chipsets/ata-ite.c
head/sys/dev/ata/chipsets/ata-jmicron.c
head/sys/dev/ata/chipsets/ata-marvell.c
head/sys/dev/ata/chipsets/ata-national.c
head/sys/dev/ata/chipsets/ata-netcell.c
head/sys/dev/ata/chipsets/ata-promise.c
head/sys/dev/ata/chipsets/ata-serverworks.c
Modified: head/sys/dev/ata/ata-all.h
==
--- head/sys/dev/ata/ata-all.h Tue Sep 1 21:40:30 2020(r365114)
+++ head/sys/dev/ata/ata-all.h Tue Sep 1 21:40:47 2020(r365115)
@@ -296,7 +296,6 @@ struct ata_request {
#define ATA_DEBUG_RQ(request, string)
#endif
-
/* structure describing an ATA/ATAPI device */
struct ata_device {
device_tdev;/* device handle */
Modified: head/sys/dev/ata/ata-isa.c
==
--- head/sys/dev/ata/ata-isa.c Tue Sep 1 21:40:30 2020(r365114)
+++ head/sys/dev/ata/ata-isa.c Tue Sep 1 21:40:47 2020(r365115)
@@ -138,7 +138,7 @@ ata_isa_attach(device_t dev)
ch->r_io[ATA_CONTROL].offset = 0;
ch->r_io[ATA_IDX_ADDR].res = io;
ata_default_registers(dev);
-
+
/* initialize softc for this channel */
ch->unit = 0;
ch->flags |= ATA_USE_16BIT;
@@ -186,7 +186,6 @@ ata_isa_resume(device_t dev)
return ata_resume(dev);
}
-
static device_method_t ata_isa_methods[] = {
/* device interface */
Modified: head/sys/dev/ata/ata-lowlevel.c
==
--- head/sys/dev/ata/ata-lowlevel.c Tue Sep 1 21:40:30 2020
(r365114)
+++ head/sys/dev/ata/ata-lowlevel.c Tue Sep 1 21:40:47 2020
(r365115)
@@ -99,7 +99,6 @@ ata_begin_transaction(struct ata_request *request)
request->flags &= ~ATA_R_DMA;
switch (request->flags & (ATA_R_ATAPI | ATA_R_DMA)) {
-
/* ATA PIO data transfer and control commands */
default:
{
@@ -116,7 +115,6 @@ ata_begin_transaction(struct ata_request *request)
/* device reset doesn't interrupt */
if (request->u.ata.command == ATA_DEVICE_RESET) {
-
int timeout = 100;
do {
DELAY(10);
@@ -254,7 +252,6 @@ ata_end_transaction(struct ata_request *request)
request->status = ATA_IDX_INB(ch, ATA_STATUS);
switch (request->flags & (ATA_R_ATAPI | ATA_R_DMA | ATA_R_CONTROL)) {
-
/* ATA PIO data transfer and control commands */
default:
@@ -273,10 +270,9 @@ ata_end_transaction(struct ata_request *request)
request->error = ATA_IDX_INB(ch, ATA_ERROR);
goto end_finished;
}
-
+
/* are we moving data ? */
if (request->flags & (ATA_R_READ | ATA_R_WRITE)) {
-
/* if read data get it */
if (request->flags & ATA_R_READ) {
int flags = ATA_S_DRQ;
@@ -297,7 +293,6 @@ ata_end_transaction(struct ata_request *request)
/* do we need a scoop more ? */
if (request->bytecount > request->donecount) {
-
/* set this transfer size according to HW capabilities */
request->transfersize =
min((request->bytecount - request->donecount),
@@ -305,7 +300,6 @@ ata_end_transaction(struct ata_request *request)
/* if data write command, output the data */
if (request->flags & ATA_R_WRITE) {
-
/* if we get an error here we are done with the HW */
if (ata_wait(ch, request->unit, (ATA_S_READY | ATA_S_DRQ))
< 0) {
device_printf(request->parent,
@@ -364,7 +358,6 @@ ata_end_transaction(struct ata_request *request)
switch ((ATA_IDX_INB(ch, ATA_IREASON) & (ATA_I_CMD | ATA_I_IN)) |
(request->status & ATA_S_DRQ)) {
-
case ATAPI_P_CMDOUT:
/* this seems to be needed for some (slow) devices */
DELAY(10);
@@ -457,7 +450,7 @@ ata_end_transaction(struct ata_request *request)
request->status |= ATA_S_ERROR;
else if (!(request->flags & ATA_R_TIMEOUT))
request->donecount = request->bytecount;
-
+
/* release SG list etc */
ch->dma.unload(request);
Modified: head/sys/dev/ata/ata-pci.c
==
--- head/sys/dev/ata/ata-pci.c Tue Sep 1 21:40:30 2020(r365114)
+++
svn commit: r365116 - in head/sys/dev/ath: . ath_dfs/null ath_hal ath_hal/ah_regdomain ath_hal/ar5210 ath_hal/ar5211 ath_hal/ar5212 ath_hal/ar5312 ath_hal/ar5416 ath_hal/ar9001 ath_hal/ar9002 ath_r...
Author: mjg Date: Tue Sep 1 21:41:07 2020 New Revision: 365116 URL: https://svnweb.freebsd.org/changeset/base/365116 Log: ath: clean up empty lines in .c and .h files Modified: head/sys/dev/ath/ah_osdep.c head/sys/dev/ath/ah_osdep_ar5210.c head/sys/dev/ath/ah_osdep_ar5211.c head/sys/dev/ath/ah_osdep_ar5212.c head/sys/dev/ath/ah_osdep_ar5416.c head/sys/dev/ath/ah_osdep_ar9300.c head/sys/dev/ath/ath_dfs/null/dfs_null.c head/sys/dev/ath/ath_hal/ah.c head/sys/dev/ath/ath_hal/ah.h head/sys/dev/ath/ath_hal/ah_eeprom_9287.c head/sys/dev/ath/ath_hal/ah_eeprom_9287.h head/sys/dev/ath/ath_hal/ah_eeprom_v14.c head/sys/dev/ath/ath_hal/ah_eeprom_v3.c head/sys/dev/ath/ath_hal/ah_eeprom_v3.h head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c head/sys/dev/ath/ath_hal/ah_internal.h head/sys/dev/ath/ath_hal/ah_regdomain.c head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_freqbands.h head/sys/dev/ath/ath_hal/ah_soc.h head/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c head/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c head/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c head/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c head/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c head/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c head/sys/dev/ath/ath_hal/ar5211/ar5211phy.h head/sys/dev/ath/ath_hal/ar5211/ar5211reg.h head/sys/dev/ath/ath_hal/ar5212/ar2316.c head/sys/dev/ath/ath_hal/ar5212/ar2317.c head/sys/dev/ath/ath_hal/ar5212/ar2413.c head/sys/dev/ath/ath_hal/ar5212/ar2425.c head/sys/dev/ath/ath_hal/ar5212/ar5111.c head/sys/dev/ath/ath_hal/ar5212/ar5112.c head/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c head/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c head/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c head/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c head/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c head/sys/dev/ath/ath_hal/ar5212/ar5212phy.h head/sys/dev/ath/ath_hal/ar5212/ar5413.c head/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c head/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c head/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c head/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c head/sys/dev/ath/ath_hal/ar5312/ar5312reg.h head/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c head/sys/dev/ath/ath_hal/ar5416/ar2133.c head/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c head/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c head/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h head/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c head/sys/dev/ath/ath_hal/ar5416/ar5416_power.c head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c head/sys/dev/ath/ath_hal/ar5416/ar5416_spectral.c head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c head/sys/dev/ath/ath_hal/ar5416/ar5416desc.h head/sys/dev/ath/ath_hal/ar5416/ar5416reg.h head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c head/sys/dev/ath/ath_hal/ar9002/ar9280_olc.c head/sys/dev/ath/ath_hal/ar9002/ar9285.c head/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c head/sys/dev/ath/ath_hal/ar9002/ar9285_btcoex.c head/sys/dev/ath/ath_hal/ar9002/ar9285_diversity.c head/sys/dev/ath/ath_hal/ar9002/ar9285_reset.c head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c head/sys/dev/ath/ath_hal/ar9002/ar9287_cal.c head/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c head/sys/dev/ath/ath_rate/amrr/amrr.c head/sys/dev/ath/ath_rate/onoe/onoe.c head/sys/dev/ath/ath_rate/sample/sample.c head/sys/dev/ath/ath_rate/sample/sample.h head/sys/dev/ath/if_ath.c head/sys/dev/ath/if_ath_ahb.c head/sys/dev/ath/if_ath_beacon.c head/sys/dev/ath/if_ath_beacon.h head/sys/dev/ath/if_ath_btcoex.c head/sys/dev/ath/if_ath_dfs.c head/sys/dev/ath/if_ath_drv.c head/sys/dev/ath/if_ath_ioctl.c head/sys/dev/ath/if_ath_led.c head/sys/dev/ath/if_ath_lna_div.c head/sys/dev/ath/if_ath_pci.c head/sys/dev/ath/if_ath_pci_devlist.h head/sys/dev/ath/if_ath_rate.c head/sys/dev/ath/if_ath_spectral.c head/sys/dev/ath/if_ath_sysctl.c head/sys/dev/ath/if_ath_tx.c head/sys/dev/ath/if_ath_tx.h head/sys/dev/ath/if_ath_tx_edma.c head/sys/dev/ath/if_ath_tx_ht.c head/sys/dev/ath/if_athioctl.h head/sys/dev/ath/if_athvar.h Modified: head/sys/dev/ath/ah_osdep.c == --- head/sys/dev/ath/ah_osdep.c Tue Sep 1 21:40:47 2020(r365115) +++ head/sys/dev/ath/ah_osdep.c Tue Sep 1 21:41:07 2020(r365116) @@ -447,7 +447,6 @@ ath_hal_modevent(module_t mod __unused, int type, void default: error = EOPNOTSUPP; break; - } return (error); } Modified: head/sys/dev/ath/ah_osdep_ar5210.c
svn commit: r365112 - head/sys/dev/an
Author: mjg
Date: Tue Sep 1 21:39:56 2020
New Revision: 365112
URL: https://svnweb.freebsd.org/changeset/base/365112
Log:
an: clean up empty lines in .c and .h files
Modified:
head/sys/dev/an/if_aironet_ieee.h
head/sys/dev/an/if_an.c
head/sys/dev/an/if_an_pccard.c
head/sys/dev/an/if_an_pci.c
head/sys/dev/an/if_anreg.h
Modified: head/sys/dev/an/if_aironet_ieee.h
==
--- head/sys/dev/an/if_aironet_ieee.h Tue Sep 1 21:39:37 2020
(r365111)
+++ head/sys/dev/an/if_aironet_ieee.h Tue Sep 1 21:39:56 2020
(r365112)
@@ -152,7 +152,6 @@ struct an_rssi_entry {
u_int8_tan_rss_dbm;
};
-
struct an_ltv_key {
u_int16_t an_len;
u_int16_t an_type;
@@ -641,7 +640,6 @@ struct an_rxframe {
u_int8_tan_addr4[6];/* 0x2C */
u_int8_tan_gaplen; /* 0x32 */
} __packed;
-
/* Do not modify this unless you are modifying LEAP itself */
#define LEAP_USERNAME_MAX 32
Modified: head/sys/dev/an/if_an.c
==
--- head/sys/dev/an/if_an.c Tue Sep 1 21:39:37 2020(r365111)
+++ head/sys/dev/an/if_an.c Tue Sep 1 21:39:56 2020(r365112)
@@ -1259,7 +1259,6 @@ an_intr(void *xsc)
return;
}
-
static int
an_cmd_struct(struct an_softc *sc, struct an_command *cmd,
struct an_reply *reply)
@@ -1572,7 +1571,6 @@ an_write_record(struct an_softc *sc, struct an_ltv_gen
return(EIO);
}
-
if (reply.an_status & AN_CMD_QUAL_MASK) {
if_printf(sc->an_ifp,
"failed to write RID 2 %x %x %x %x %x, %d\n",
@@ -1842,7 +1840,6 @@ an_setdef(struct an_softc *sc, struct an_req *areq)
return;
}
-
/* Reinitialize the card. */
if (ifp->if_flags)
an_init_locked(sc);
@@ -2867,7 +2864,6 @@ an_start_locked(struct ifnet *ifp)
bcopy((caddr_t)>an_txbuf, [0x44],
tx_frame_802_3.an_tx_802_3_payload_len);
-
bzero(_tx_desc, sizeof(an_tx_desc));
an_tx_desc.an_offset = 0;
an_tx_desc.an_eoc = 1;
@@ -3044,7 +3040,6 @@ int an_sigitems; /* number of
cached entries */
struct an_sigcache an_sigcache[MAXANCACHE];/* array of cache entries */
int an_nextitem; /* index/# of entries */
-
#endif
/* control variables for cache filtering. Basic idea is
@@ -3142,7 +3137,6 @@ an_cache_store(struct an_softc *sc, struct ether_heade
* if table full, then we need to replace LRU entry
*/
else{
-
/* check for space in cache table
* note: an_nextitem also holds number of entries
* added in the cache table
@@ -3183,7 +3177,6 @@ an_cache_store(struct an_softc *sc, struct ether_heade
}
bcopy( eh->ether_shost, sc->an_sigcache[cache_slot].macsrc, 6);
-
switch (an_cache_mode) {
case DBM:
if (sc->an_have_rssimap) {
@@ -3553,7 +3546,6 @@ cmdreset(struct ifnet *ifp)
FLASH_DELAY(sc, 1000); /* WAS 600 12/7/00 */
-
if (!(status = WaitBusy(ifp, 100))) {
if_printf(ifp, "Waitbusy hang AFTER RESET =%d\n", status);
AN_UNLOCK(sc);
@@ -3603,7 +3595,6 @@ flashgchar(struct ifnet *ifp, int matchbyte, int dwell
int success = -1;
struct an_softc *sc = ifp->if_softc;
-
do {
rchar = CSR_READ_2(sc, AN_SW1(sc->mpi350));
@@ -3675,7 +3666,6 @@ flashpchar(struct ifnet *ifp, int byte, int dwelltime)
dwelltime -= 50;
echo = CSR_READ_2(sc, AN_SW1(sc->mpi350));
} while (dwelltime >= 0 && echo != byte);
-
CSR_WRITE_2(sc, AN_SW1(sc->mpi350), 0);
Modified: head/sys/dev/an/if_an_pccard.c
==
--- head/sys/dev/an/if_an_pccard.c Tue Sep 1 21:39:37 2020
(r365111)
+++ head/sys/dev/an/if_an_pccard.c Tue Sep 1 21:39:56 2020
(r365112)
@@ -88,7 +88,6 @@ static device_method_t an_pccard_methods[] = {
DEVMETHOD(device_attach,an_pccard_attach),
DEVMETHOD(device_detach,an_detach),
DEVMETHOD(device_shutdown, an_shutdown),
-
{ 0, 0 }
};
@@ -147,7 +146,7 @@ an_pccard_attach(device_t dev)
error = an_attach(sc, flags);
if (error)
goto fail;
-
+
/*
* Must setup the interrupt after the an_attach to prevent racing.
*/
Modified: head/sys/dev/an/if_an_pci.c
==
--- head/sys/dev/an/if_an_pci.c
svn commit: r365114 - head/sys/dev/asmc
Author: mjg
Date: Tue Sep 1 21:40:30 2020
New Revision: 365114
URL: https://svnweb.freebsd.org/changeset/base/365114
Log:
asmc: clean up empty lines in .c and .h files
Modified:
head/sys/dev/asmc/asmc.c
head/sys/dev/asmc/asmcvar.h
Modified: head/sys/dev/asmc/asmc.c
==
--- head/sys/dev/asmc/asmc.cTue Sep 1 21:40:13 2020(r365113)
+++ head/sys/dev/asmc/asmc.cTue Sep 1 21:40:30 2020(r365114)
@@ -371,7 +371,6 @@ struct asmc_model asmc_models[] = {
ASMC_LIGHT_FUNCS,
ASMC_MBA7_TEMPS, ASMC_MBA7_TEMPNAMES, ASMC_MBA7_TEMPDESCS
},
-
{ NULL, NULL }
};
@@ -389,7 +388,6 @@ static device_method_t asmc_methods[] = {
DEVMETHOD(device_attach,asmc_attach),
DEVMETHOD(device_detach,asmc_detach),
DEVMETHOD(device_resume,asmc_resume),
-
{ 0, 0 }
};
@@ -712,7 +710,6 @@ asmc_resume(device_t dev)
return (0);
}
-
#ifdef DEBUG
void asmc_dumpall(device_t dev)
{
@@ -871,7 +868,6 @@ asmc_wait(device_t dev, uint8_t val)
*/
static int
asmc_command(device_t dev, uint8_t command) {
-
int i;
struct asmc_softc *sc = device_get_softc(dev);
@@ -1171,7 +1167,6 @@ asmc_mb_sysctl_fansafespeed(SYSCTL_HANDLER_ARGS)
return (error);
}
-
static int
asmc_mb_sysctl_fanminspeed(SYSCTL_HANDLER_ARGS)
{
@@ -1315,8 +1310,6 @@ asmc_sms_intrfast(void *arg)
taskqueue_enqueue(sc->sc_sms_tq, >sc_sms_task);
return (FILTER_HANDLED);
}
-
-
static void
asmc_sms_printintr(device_t dev, uint8_t type)
Modified: head/sys/dev/asmc/asmcvar.h
==
--- head/sys/dev/asmc/asmcvar.h Tue Sep 1 21:40:13 2020(r365113)
+++ head/sys/dev/asmc/asmcvar.h Tue Sep 1 21:40:30 2020(r365114)
@@ -76,7 +76,6 @@ struct asmc_softc {
*/
#define ASMC_INTPORT_READ(sc) bus_read_1(sc->sc_ioport, 0x1f)
-
/* Number of keys */
#define ASMC_NKEYS "#KEY" /* RO; 4 bytes */
@@ -292,7 +291,6 @@ struct asmc_softc {
"GPU Die", "Memory Bank A1", "Memory Module
A1", \
"PCH Die" }
-
#define ASMC_MBP112_TEMPS { "TB0T", "TB1T", "TB2T", "TBXT", "TC0E", \
"TC0F", "TC0P", "TC1C", "TC2C", "TC3C", \
"TC4C", "TCFC", "TCGC", "TCSA", "TCTD", \
@@ -349,8 +347,6 @@ struct asmc_softc {
"TM0S", "TP0P", "TPCD", "TW0P", "Ta0P", \
"TaSP", "Th1H", "Th2H", "Ts0P", "Ts0S", \
"Ts1S" }
-
-
#define ASMC_MM_TEMPS { "TN0P", "TN1P", NULL }
#define ASMC_MM_TEMPNAMES { "northbridge1", "northbridge2" }
#define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \
@@ -433,7 +429,7 @@ struct asmc_softc {
"memory_proximity",
"pch_controller_proximity", \
"pch_controller_die", "pwr_supply", \
"wireless_proximity", }
-
+
#define ASMC_MM52_TEMPDESCS{ "Ambient Air Proximity Temperature", \
"Combo Ambient CPU PCH Wireless DIMM
Temperature", \
"CPU Die Temperature", "CPU Proximity
Temperature", \
@@ -585,7 +581,6 @@ struct asmc_softc {
"Te3F", "Te3S", "Te4F", "Te4S", "Te5F", \
"Te5S", "TeGG", "TeGP", "TeRG", "TeRP", \
"TeRV", "Tp0C", "Tp1C", "TpPS", "TpTG", }
-
#defineASMC_MBA_TEMPS { "TB0T", NULL }
#defineASMC_MBA_TEMPNAMES { "enclosure" }
#defineASMC_MBA_TEMPDESCS { "Enclosure Bottom" }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365113 - head/sys/dev/arcmsr
Author: mjg
Date: Tue Sep 1 21:40:13 2020
New Revision: 365113
URL: https://svnweb.freebsd.org/changeset/base/365113
Log:
arcmsr: clean up empty lines in .c and .h files
Modified:
head/sys/dev/arcmsr/arcmsr.c
head/sys/dev/arcmsr/arcmsr.h
Modified: head/sys/dev/arcmsr/arcmsr.c
==
--- head/sys/dev/arcmsr/arcmsr.cTue Sep 1 21:39:56 2020
(r365112)
+++ head/sys/dev/arcmsr/arcmsr.cTue Sep 1 21:40:13 2020
(r365113)
@@ -263,7 +263,7 @@ static int arcmsr_ioctl(struct cdev *dev, u_long ioctl
{
int unit = dev2unit(dev);
struct AdapterControlBlock *acb = devclass_get_softc(arcmsr_devclass,
unit);
-
+
if (acb == NULL) {
return ENXIO;
}
@@ -451,7 +451,7 @@ static u_int8_t arcmsr_hbe_wait_msgint_ready(struct Ad
{
u_int32_t Index, read_doorbell;
u_int8_t Retries = 0x00;
-
+
do {
for(Index=0; Index < 100; Index++) {
read_doorbell = CHIP_REG_READ32(HBE_MessageUnit, 0,
iobound_doorbell);
@@ -542,7 +542,7 @@ static void arcmsr_flush_hbd_cache(struct AdapterContr
static void arcmsr_flush_hbe_cache(struct AdapterControlBlock *acb)
{
int retry_count = 30;/* enlarge wait flush adapter cache time: 10
minute */
-
+
CHIP_REG_WRITE32(HBE_MessageUnit, 0, inbound_msgaddr0,
ARCMSR_INBOUND_MESG0_FLUSH_CACHE);
acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE;
CHIP_REG_WRITE32(HBE_MessageUnit, 0, iobound_doorbell,
acb->out_doorbell);
@@ -934,7 +934,6 @@ static void arcmsr_done4abort_postqueue(struct Adapter
}
break;
case ACB_ADAPTER_TYPE_C: {
-
while((CHIP_REG_READ32(HBC_MessageUnit, 0,
host_int_status) & ARCMSR_HBCMU_OUTBOUND_POSTQUEUE_ISR) && (i++ <
ARCMSR_MAX_OUTSTANDING_CMD)) {
flag_srb = CHIP_REG_READ32(HBC_MessageUnit, 0,
outbound_queueport_low);
error = (flag_srb &
ARCMSR_SRBREPLY_FLAG_ERROR_MODE1) ? TRUE : FALSE;
@@ -1207,7 +1206,7 @@ static struct QBUFFER *arcmsr_get_iop_rqbuffer( struct
break;
case ACB_ADAPTER_TYPE_E: {
struct HBE_MessageUnit *phbcmu = (struct
HBE_MessageUnit *)acb->pmu;
-
+
qbuffer = (struct QBUFFER *)>message_rbuffer;
}
break;
@@ -1249,7 +1248,7 @@ static struct QBUFFER *arcmsr_get_iop_wqbuffer( struct
break;
case ACB_ADAPTER_TYPE_E: {
struct HBE_MessageUnit *phbcmu = (struct
HBE_MessageUnit *)acb->pmu;
-
+
qbuffer = (struct QBUFFER *)>message_wbuffer;
}
break;
@@ -1462,7 +1461,6 @@ static void arcmsr_poll(struct cam_sim *psim)
*/
static u_int32_t arcmsr_Read_iop_rqbuffer_data_D(struct AdapterControlBlock
*acb,
struct QBUFFER *prbuffer) {
-
u_int8_t *pQbuffer;
u_int8_t *buf1 = NULL;
u_int32_t *iop_data, *buf2 = NULL;
@@ -1507,7 +1505,6 @@ static u_int32_t arcmsr_Read_iop_rqbuffer_data_D(struc
*/
static u_int32_t arcmsr_Read_iop_rqbuffer_data(struct AdapterControlBlock *acb,
struct QBUFFER *prbuffer) {
-
u_int8_t *pQbuffer;
u_int8_t *iop_data;
u_int32_t iop_len;
@@ -1689,7 +1686,6 @@ static void arcmsr_rescan_lun(struct
AdapterControlBlo
xpt_action(ccb);
}
-
static void arcmsr_abort_dr_ccbs(struct AdapterControlBlock *acb, int target,
int lun)
{
struct CommandControlBlock *srb;
@@ -1965,7 +1961,7 @@ static void arcmsr_hbd_doorbell_isr(struct AdapterCont
static void arcmsr_hbe_doorbell_isr(struct AdapterControlBlock *acb)
{
u_int32_t doorbell_status, in_doorbell;
-
+
/*
***
** Maybe here we need to check wrqbuffer_lock is lock or not
@@ -2136,7 +2132,7 @@ static void arcmsr_hbe_postqueue_isr(struct AdapterCon
u_int16_t error;
uint32_t doneq_index;
uint16_t cmdSMID;
-
+
/*
*
** areca cdb command done
@@ -2988,7 +2984,7 @@ static void arcmsr_handle_virtual_command(struct Adapt
case INQUIRY: {
unsigned char inqdata[36];
char *buffer = pccb->csio.data_ptr;
-
+
inqdata[0] = T_PROCESSOR; /* Periph Qualifier & Periph
Dev Type */
inqdata[1] = 0; /* rem media bit & Dev Type
Modifier */
inqdata[2] = 0; /* ISO, ECMA, & ANSI versions */
@@ -3110,7 +3106,7 @@ static void arcmsr_action(struct cam_sim *psim, union
}
case XPT_ABORT: {
union ccb
svn commit: r365111 - head/sys/dev/amr
Author: mjg
Date: Tue Sep 1 21:39:37 2020
New Revision: 365111
URL: https://svnweb.freebsd.org/changeset/base/365111
Log:
amr: clean up empty lines in .c and .h files
Modified:
head/sys/dev/amr/amr.c
head/sys/dev/amr/amr_cam.c
head/sys/dev/amr/amr_disk.c
head/sys/dev/amr/amr_pci.c
head/sys/dev/amr/amrreg.h
Modified: head/sys/dev/amr/amr.c
==
--- head/sys/dev/amr/amr.c Tue Sep 1 21:39:19 2020(r365110)
+++ head/sys/dev/amr/amr.c Tue Sep 1 21:39:37 2020(r365111)
@@ -371,7 +371,6 @@ amr_init_sysctl(struct amr_softc *sc)
"");
}
-
/***
* Free resources associated with a controller instance
*/
@@ -777,7 +776,6 @@ amr_ioctl(struct cdev *dev, u_long cmd, caddr_t addr,
ap = NULL;
switch(cmd) {
-
case AMR_IO_VERSION:
debug(1, "AMR_IO_VERSION");
*arg.result = AMR_IO_VERSION_NUMBER;
@@ -977,7 +975,6 @@ amr_query_controller(struct amr_softc *sc)
*/
if ((aex = amr_enquiry(sc, 2048, AMR_CMD_CONFIG, AMR_CONFIG_ENQ3,
AMR_CONFIG_ENQ3_SOLICITED_FULL, )) != NULL) {
-
/*
* Fetch current state of logical drives.
*/
@@ -1011,7 +1008,6 @@ amr_query_controller(struct amr_softc *sc)
device_printf(sc->amr_dev, "delete logical drives supported by
controller\n");
}
} else {
-
/* failed, try the 8LD ENQUIRY commands */
if ((ae = (struct amr_enquiry *)amr_enquiry(sc, 2048,
AMR_CMD_EXT_ENQUIRY2, 0, 0, )) == NULL) {
if ((ae = (struct amr_enquiry *)amr_enquiry(sc, 2048,
AMR_CMD_ENQUIRY, 0, 0, )) == NULL) {
@@ -1173,7 +1169,6 @@ amr_support_ext_cdb(struct amr_softc *sc)
mbox[0] = 0xA4;
mbox[2] = 0x16;
-
/* we have to poll, as the system may be going down or otherwise damaged */
if (sc->amr_poll_command(ac))
goto out;
@@ -1203,7 +1198,6 @@ amr_startio(struct amr_softc *sc)
/* spin until something prevents us from doing any work */
for (;;) {
-
/* Don't bother to queue commands no bounce buffers are available. */
if (sc->amr_state & AMR_STATE_QUEUE_FRZN)
break;
@@ -1342,7 +1336,6 @@ amr_bio_command(struct amr_softc *sc, struct amr_comma
/* we fill in the s/g related data when the command is mapped */
-
*acp = ac;
return(error);
}
@@ -1643,7 +1636,7 @@ amr_setup_data(void *arg, bus_dma_segment_t *segs, int
amr_requeue_ready(ac);
}
}
-
+
static void
amr_setup_ccb(void *arg, bus_dma_segment_t *segs, int nsegs, int err)
{
@@ -1730,9 +1723,7 @@ amr_unmapcmd(struct amr_command *ac)
/* if the command involved data at all and was mapped */
if (ac->ac_flags & AMR_CMD_MAPPED) {
-
if (ac->ac_data != NULL) {
-
flag = 0;
if (ac->ac_flags & AMR_CMD_DATAIN)
flag |= BUS_DMASYNC_POSTREAD;
@@ -1834,7 +1825,6 @@ amr_done(struct amr_softc *sc)
/* really a busy command? */
if (ac != NULL) {
-
/* pull the command from the busy index */
amr_freeslot(ac);
@@ -2144,7 +2134,6 @@ amr_quartz_get_work(struct amr_softc *sc, struct amr_m
/* work waiting for us? */
if ((outd = AMR_QGET_ODB(sc)) == AMR_QODB_READY) {
-
/* acknowledge interrupt */
AMR_QPUT_ODB(sc, AMR_QODB_READY);
@@ -2275,7 +2264,7 @@ amr_std_init(struct amr_softc *sc)
device_printf(sc->amr_dev, "initial init status %x\n",
AMR_SGET_INITSTATUS(sc));
AMR_SRESET(sc);
-
+
ostatus = 0xff;
while ((status = AMR_SGET_INITSTATUS(sc)) != AMR_SINIT_DONE) {
if (status != ostatus) {
@@ -2331,7 +2320,6 @@ amr_describe_controller(struct amr_softc *sc)
prod = amr_describe_code(amr_table_adaptertype, ae->ae_signature);
} else if ((ae = (struct amr_enquiry *)amr_enquiry(sc, 2048,
AMR_CMD_ENQUIRY, 0, 0, )) != NULL) {
-
/*
* Try to work it out based on the PCI signatures.
*/
@@ -2366,7 +2354,6 @@ amr_describe_controller(struct amr_softc *sc)
ae->ae_adapter.aa_bios[2] <= 'Z' &&
ae->ae_adapter.aa_bios[1] < ' ' &&
ae->ae_adapter.aa_bios[0] < ' ') {
-
/* this looks like we have an HP NetRaid version of the MegaRaid */
if(ae->ae_signature == AMR_SIG_438) {
@@ -2428,8 +2415,6 @@ amr_dump_blocks(struct amr_softc *sc, int unit, u_int3
sc->amr_state &= ~AMR_STATE_INTEN;
return (error);
}
-
-
#ifdef AMR_DEBUG
/
Modified: head/sys/dev/amr/amr_cam.c
==
--- head/sys/dev/amr/amr_cam.c Tue Sep 1 21:39:19 2020(r365110)
+++ head/sys/dev/amr/amr_cam.c Tue Sep 1 21:39:37 2020(r365111)
@@
svn commit: r365110 - in head/sys/dev: amd_ecc_inject amdgpio amdpm amdsbwd amdsmb
Author: mjg
Date: Tue Sep 1 21:39:19 2020
New Revision: 365110
URL: https://svnweb.freebsd.org/changeset/base/365110
Log:
amd*: clean up empty lines in .c and .h files
Modified:
head/sys/dev/amd_ecc_inject/ecc_inject.c
head/sys/dev/amdgpio/amdgpio.c
head/sys/dev/amdpm/amdpm.c
head/sys/dev/amdsbwd/amd_chipset.h
head/sys/dev/amdsbwd/amdsbwd.c
head/sys/dev/amdsmb/amdsmb.c
Modified: head/sys/dev/amd_ecc_inject/ecc_inject.c
==
--- head/sys/dev/amd_ecc_inject/ecc_inject.cTue Sep 1 21:38:18 2020
(r365109)
+++ head/sys/dev/amd_ecc_inject/ecc_inject.cTue Sep 1 21:39:19 2020
(r365110)
@@ -45,7 +45,6 @@
#include
#include
-
/*
* See BKDG for AMD Family 15h Models 00h-0Fh Processors
* (publication 42301 Rev 3.08 - March 12, 2012):
Modified: head/sys/dev/amdgpio/amdgpio.c
==
--- head/sys/dev/amdgpio/amdgpio.c Tue Sep 1 21:38:18 2020
(r365109)
+++ head/sys/dev/amdgpio/amdgpio.c Tue Sep 1 21:39:19 2020
(r365110)
@@ -179,7 +179,6 @@ amdgpio_pin_getflags(device_t dev, uint32_t pin, uint3
sc = device_get_softc(dev);
-
dprintf("pin %d\n", pin);
if (!amdgpio_valid_pin(sc, pin))
return (EINVAL);
@@ -427,7 +426,6 @@ err_rsrc:
return (ENXIO);
}
-
static int
amdgpio_detach(device_t dev)
Modified: head/sys/dev/amdpm/amdpm.c
==
--- head/sys/dev/amdpm/amdpm.c Tue Sep 1 21:38:18 2020(r365109)
+++ head/sys/dev/amdpm/amdpm.c Tue Sep 1 21:39:19 2020(r365110)
@@ -195,7 +195,7 @@ amdpm_attach(device_t dev)
{
struct amdpm_softc *amdpm_sc = device_get_softc(dev);
u_char val_b;
-
+
/* Enable I/O block access */
val_b = pci_read_config(dev, AMDPCI_GEN_CONFIG_PM, 1);
pci_write_config(dev, AMDPCI_GEN_CONFIG_PM, val_b | AMDPCI_PMIOEN, 1);
@@ -208,7 +208,7 @@ amdpm_attach(device_t dev)
amdpm_sc->rid = NFPCI_PMBASE;
amdpm_sc->res = bus_alloc_resource_any(dev, SYS_RES_IOPORT,
_sc->rid, RF_ACTIVE);
-
+
if (amdpm_sc->res == NULL) {
device_printf(dev, "could not map i/o space\n");
return (ENXIO);
@@ -278,7 +278,7 @@ static int
amdpm_abort(struct amdpm_softc *sc)
{
u_short l;
-
+
l = AMDPM_SMBINW(sc, AMDSMB_GLOBAL_ENABLE);
AMDPM_SMBOUTW(sc, AMDSMB_GLOBAL_ENABLE, l | AMDSMB_GE_ABORT);
@@ -562,7 +562,7 @@ amdpm_bwrite(device_t dev, u_char slave, char cmd, u_c
}
AMDPM_SMBOUTW(sc, AMDSMB_HSTADDR, slave & ~LSB);
-
+
/*
* Do we have to reset the internal 32-byte buffer?
* Can't see how to do this from the data sheet.
@@ -606,7 +606,7 @@ amdpm_bread(device_t dev, u_char slave, char cmd, u_ch
}
AMDPM_SMBOUTW(sc, AMDSMB_HSTADDR, slave | LSB);
-
+
AMDPM_SMBOUTB(sc, AMDSMB_HSTCMD, cmd);
l = AMDPM_SMBINW(sc, AMDSMB_GLOBAL_ENABLE);
@@ -641,7 +641,7 @@ static device_method_t amdpm_methods[] = {
DEVMETHOD(device_probe, amdpm_probe),
DEVMETHOD(device_attach,amdpm_attach),
DEVMETHOD(device_detach,amdpm_detach),
-
+
/* SMBus interface */
DEVMETHOD(smbus_callback, amdpm_callback),
DEVMETHOD(smbus_quick, amdpm_quick),
@@ -653,7 +653,6 @@ static device_method_t amdpm_methods[] = {
DEVMETHOD(smbus_readw, amdpm_readw),
DEVMETHOD(smbus_bwrite, amdpm_bwrite),
DEVMETHOD(smbus_bread, amdpm_bread),
-
{ 0, 0 }
};
Modified: head/sys/dev/amdsbwd/amd_chipset.h
==
--- head/sys/dev/amdsbwd/amd_chipset.h Tue Sep 1 21:38:18 2020
(r365109)
+++ head/sys/dev/amdsbwd/amd_chipset.h Tue Sep 1 21:39:19 2020
(r365110)
@@ -147,4 +147,3 @@
#defineAMDCZ49_SMBUS_REVID 0x49
#defineHYGONCZ_SMBUS_DEVID 0x790b1d94
-
Modified: head/sys/dev/amdsbwd/amdsbwd.c
==
--- head/sys/dev/amdsbwd/amdsbwd.c Tue Sep 1 21:38:18 2020
(r365109)
+++ head/sys/dev/amdsbwd/amdsbwd.c Tue Sep 1 21:39:19 2020
(r365110)
@@ -132,7 +132,6 @@ static driver_t amdsbwd_driver = {
DRIVER_MODULE(amdsbwd, isa, amdsbwd_driver, amdsbwd_devclass, NULL, NULL);
-
static uint8_t
pmio_read(struct resource *res, uint8_t reg)
{
@@ -279,7 +278,6 @@ amdsbwd_identify(driver_t *driver, device_t parent)
if (child == NULL)
device_printf(parent, "add amdsbwd child failed\n");
}
-
static void
amdsbwd_probe_sb7xx(device_t dev, struct resource *pmres, uint32_t
svn commit: r365107 - head/sys/dev/ale
Author: mjg Date: Tue Sep 1 21:37:53 2020 New Revision: 365107 URL: https://svnweb.freebsd.org/changeset/base/365107 Log: ale: clean up empty lines in .c and .h files Modified: head/sys/dev/ale/if_ale.c Modified: head/sys/dev/ale/if_ale.c == --- head/sys/dev/ale/if_ale.c Tue Sep 1 21:37:35 2020(r365106) +++ head/sys/dev/ale/if_ale.c Tue Sep 1 21:37:53 2020(r365107) @@ -2394,7 +2394,6 @@ ale_rx_update_page(struct ale_softc *sc, struct ale_rx } } - /* * It seems that AR81xx controller can compute partial checksum. * The partial checksum value can be used to accelerate checksum ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365108 - head/sys/dev/alpm
Author: mjg
Date: Tue Sep 1 21:38:06 2020
New Revision: 365108
URL: https://svnweb.freebsd.org/changeset/base/365108
Log:
alpm: clean up empty lines in .c and .h files
Modified:
head/sys/dev/alpm/alpm.c
Modified: head/sys/dev/alpm/alpm.c
==
--- head/sys/dev/alpm/alpm.cTue Sep 1 21:37:53 2020(r365107)
+++ head/sys/dev/alpm/alpm.cTue Sep 1 21:38:06 2020(r365108)
@@ -557,7 +557,7 @@ alpm_bwrite(device_t dev, u_char slave, char cmd, u_ch
}
ALPM_SMBOUTB(sc, SMBHADDR, slave & ~LSB);
-
+
/* set the cmd and reset the
* 32-byte long internal buffer */
ALPM_SMBOUTB(sc, SMBCMD, SMBWRBLOCK | SMB_BLK_CLR);
@@ -598,7 +598,7 @@ alpm_bread(device_t dev, u_char slave, char cmd, u_cha
}
ALPM_SMBOUTB(sc, SMBHADDR, slave | LSB);
-
+
/* set the cmd and reset the
* 32-byte long internal buffer */
ALPM_SMBOUTB(sc, SMBCMD, SMBWRBLOCK | SMB_BLK_CLR);
@@ -634,7 +634,7 @@ static device_method_t alpm_methods[] = {
DEVMETHOD(device_probe, alpm_probe),
DEVMETHOD(device_attach,alpm_attach),
DEVMETHOD(device_detach,alpm_detach),
-
+
/* smbus interface */
DEVMETHOD(smbus_callback, alpm_callback),
DEVMETHOD(smbus_quick, alpm_quick),
@@ -646,7 +646,6 @@ static device_method_t alpm_methods[] = {
DEVMETHOD(smbus_readw, alpm_readw),
DEVMETHOD(smbus_bwrite, alpm_bwrite),
DEVMETHOD(smbus_bread, alpm_bread),
-
{ 0, 0 }
};
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365109 - in head/sys/dev/altera: atse msgdma pio softdma
Author: mjg
Date: Tue Sep 1 21:38:18 2020
New Revision: 365109
URL: https://svnweb.freebsd.org/changeset/base/365109
Log:
altera: clean up empty lines in .c and .h files
Modified:
head/sys/dev/altera/atse/if_atse.c
head/sys/dev/altera/atse/if_atsereg.h
head/sys/dev/altera/msgdma/msgdma.c
head/sys/dev/altera/pio/pio.h
head/sys/dev/altera/softdma/softdma.c
Modified: head/sys/dev/altera/atse/if_atse.c
==
--- head/sys/dev/altera/atse/if_atse.c Tue Sep 1 21:38:06 2020
(r365108)
+++ head/sys/dev/altera/atse/if_atse.c Tue Sep 1 21:38:18 2020
(r365109)
@@ -588,7 +588,6 @@ atse_get_eth_address(struct atse_softc *sc)
if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x07 &&
sc->atse_eth_addr[2] == 0xed && sc->atse_eth_addr[3] == 0xff &&
sc->atse_eth_addr[4] == 0xed && sc->atse_eth_addr[5] == 0x15) {
-
device_printf(sc->atse_dev, "Factory programmed Ethernet "
"hardware address blacklisted. Falling back to random "
"address to avoid collisions.\n");
@@ -1177,7 +1176,6 @@ static struct atse_rx_err_stats_regs {
const char *name;
const char *descr;
} atse_rx_err_stats_regs[] = {
-
#defineATSE_RX_ERR_FIFO_THRES_EOP 0 /* FIFO threshold reached, on
EOP. */
#defineATSE_RX_ERR_ELEN1 /* Frame/payload length not
valid. */
#defineATSE_RX_ERR_CRC32 2 /* CRC-32 error. */
@@ -1559,7 +1557,6 @@ atse_miibus_statchg(device_t dev)
if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) ==
(IFM_ACTIVE | IFM_AVALID)) {
-
switch (IFM_SUBTYPE(mii->mii_media_active)) {
case IFM_10_T:
val4 |= BASE_CFG_COMMAND_CONFIG_ENA_10;
Modified: head/sys/dev/altera/atse/if_atsereg.h
==
--- head/sys/dev/altera/atse/if_atsereg.h Tue Sep 1 21:38:06 2020
(r365108)
+++ head/sys/dev/altera/atse/if_atsereg.h Tue Sep 1 21:38:18 2020
(r365109)
@@ -118,7 +118,6 @@ static char *fifo_memory_block[] = {
#definePCS_TXRX_ENABLE_DYNAMIC_RECONF 0 /* Dynamic trans.
reconfig. */
#definePCS_TXRX_STARTING_CHANNEL 0 /* 0..284. */
-
/* --
*/
/* XXX more values based on the bitmaps provided. Cleanup. */
@@ -397,7 +396,6 @@ static char *fifo_memory_block[] = {
/* 0xC8 - 0xCF, Reserved; set to zero, ignore on read. */
/* 0xD7 - 0xFF, Reserved; set to zero, ignore on read. */
-
/* --
*/
/* DE4 Intel Strata Flash Ethernet Option Bits area. */
@@ -456,7 +454,6 @@ struct atse_softc {
struct buf_ring *br;
struct mtx br_mtx;
};
-
intatse_attach(device_t);
intatse_detach_dev(device_t);
Modified: head/sys/dev/altera/msgdma/msgdma.c
==
--- head/sys/dev/altera/msgdma/msgdma.c Tue Sep 1 21:38:06 2020
(r365108)
+++ head/sys/dev/altera/msgdma/msgdma.c Tue Sep 1 21:38:18 2020
(r365109)
@@ -399,7 +399,6 @@ msgdma_desc_alloc(struct msgdma_softc *sc, struct msgd
return (0);
}
-
static int
msgdma_channel_alloc(device_t dev, struct xdma_channel *xchan)
{
Modified: head/sys/dev/altera/pio/pio.h
==
--- head/sys/dev/altera/pio/pio.h Tue Sep 1 21:38:06 2020
(r365108)
+++ head/sys/dev/altera/pio/pio.h Tue Sep 1 21:38:18 2020
(r365109)
@@ -40,4 +40,3 @@
#definePIO_EDGECAPT0x0c
#definePIO_OUTSET 0x10
#definePIO_OUTCLR 0x14
-
Modified: head/sys/dev/altera/softdma/softdma.c
==
--- head/sys/dev/altera/softdma/softdma.c Tue Sep 1 21:38:06 2020
(r365108)
+++ head/sys/dev/altera/softdma/softdma.c Tue Sep 1 21:38:18 2020
(r365109)
@@ -501,7 +501,6 @@ softdma_process_descriptors(struct softdma_channel *ch
desc = >descs[chan->idx_tail];
while (desc != NULL) {
-
if ((desc->control & CONTROL_OWN) == 0) {
break;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365105 - in head/sys/dev/aic7xxx: . aicasm
Author: mjg
Date: Tue Sep 1 21:37:14 2020
New Revision: 365105
URL: https://svnweb.freebsd.org/changeset/base/365105
Log:
aic7xxx: clean up empty lines in .c and .h files
Modified:
head/sys/dev/aic7xxx/ahc_isa.c
head/sys/dev/aic7xxx/ahc_pci.c
head/sys/dev/aic7xxx/ahd_pci.c
head/sys/dev/aic7xxx/aic7770.c
head/sys/dev/aic7xxx/aic79xx.c
head/sys/dev/aic7xxx/aic79xx_inline.h
head/sys/dev/aic7xxx/aic79xx_osm.c
head/sys/dev/aic7xxx/aic79xx_osm.h
head/sys/dev/aic7xxx/aic79xx_pci.c
head/sys/dev/aic7xxx/aic79xx_reg.h
head/sys/dev/aic7xxx/aic79xx_reg_print.c
head/sys/dev/aic7xxx/aic7xxx.c
head/sys/dev/aic7xxx/aic7xxx_inline.h
head/sys/dev/aic7xxx/aic7xxx_osm.c
head/sys/dev/aic7xxx/aic7xxx_pci.c
head/sys/dev/aic7xxx/aic7xxx_reg.h
head/sys/dev/aic7xxx/aic7xxx_reg_print.c
head/sys/dev/aic7xxx/aic_osm_lib.c
head/sys/dev/aic7xxx/aic_osm_lib.h
head/sys/dev/aic7xxx/aicasm/aicasm.c
head/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
Modified: head/sys/dev/aic7xxx/ahc_isa.c
==
--- head/sys/dev/aic7xxx/ahc_isa.c Tue Sep 1 21:36:40 2020
(r365104)
+++ head/sys/dev/aic7xxx/ahc_isa.c Tue Sep 1 21:37:14 2020
(r365105)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
#include /* For CHAR_BIT*/
#include /* For ISA attach glue */
-
static struct aic7770_identity *ahc_isa_find_device(bus_space_tag_t tag,
bus_space_handle_t bsh);
static voidahc_isa_identify(driver_t *driver,
Modified: head/sys/dev/aic7xxx/ahc_pci.c
==
--- head/sys/dev/aic7xxx/ahc_pci.c Tue Sep 1 21:36:40 2020
(r365104)
+++ head/sys/dev/aic7xxx/ahc_pci.c Tue Sep 1 21:37:14 2020
(r365105)
@@ -165,7 +165,6 @@ ahc_pci_map_registers(struct ahc_softc *ahc)
}
if (allow_memio != 0) {
-
regs_type = SYS_RES_MEMORY;
regs_id = AHC_PCI_MEMADDR;
regs = bus_alloc_resource_any(ahc->dev_softc, regs_type,
Modified: head/sys/dev/aic7xxx/ahd_pci.c
==
--- head/sys/dev/aic7xxx/ahd_pci.c Tue Sep 1 21:36:40 2020
(r365104)
+++ head/sys/dev/aic7xxx/ahd_pci.c Tue Sep 1 21:37:14 2020
(r365105)
@@ -165,7 +165,6 @@ ahd_pci_map_registers(struct ahd_softc *ahd)
if ((ahd->bugs & AHD_PCIX_MMAPIO_BUG) == 0
&& allow_memio != 0) {
-
regs_type = SYS_RES_MEMORY;
regs_id = AHD_PCI_MEMADDR;
regs = bus_alloc_resource_any(ahd->dev_softc, regs_type,
Modified: head/sys/dev/aic7xxx/aic7770.c
==
--- head/sys/dev/aic7xxx/aic7770.c Tue Sep 1 21:36:40 2020
(r365104)
+++ head/sys/dev/aic7xxx/aic7770.c Tue Sep 1 21:37:14 2020
(r365105)
@@ -323,7 +323,6 @@ aha2840_load_seeprom(struct ahc_softc *ahc)
/*start_addr*/0, sizeof(*sc)/2);
if (have_seeprom) {
-
if (ahc_verify_cksum(sc) == 0) {
if(bootverbose)
printf ("checksum error\n");
Modified: head/sys/dev/aic7xxx/aic79xx.c
==
--- head/sys/dev/aic7xxx/aic79xx.c Tue Sep 1 21:36:40 2020
(r365104)
+++ head/sys/dev/aic7xxx/aic79xx.c Tue Sep 1 21:37:14 2020
(r365105)
@@ -487,7 +487,6 @@ rescan_fifos:
* if this if for an SCB in the qinfifo.
*/
while (((ccscbctl = ahd_inb(ahd, CCSCBCTL)) & (CCARREN|CCSCBEN)) != 0) {
-
if ((ccscbctl & (CCSCBDIR|CCARREN)) == (CCSCBDIR|CCARREN)) {
if ((ccscbctl & ARRDONE) != 0)
break;
@@ -542,7 +541,6 @@ rescan_fifos:
scbid = ahd_inw(ahd, COMPLETE_ON_QFREEZE_HEAD);
while (!SCBID_IS_NULL(scbid)) {
-
ahd_set_scbptr(ahd, scbid);
next_scbid = ahd_inw_scbram(ahd, SCB_NEXT_COMPLETE);
scb = ahd_lookup_scb(ahd, scbid);
@@ -560,7 +558,6 @@ rescan_fifos:
scbid = ahd_inw(ahd, COMPLETE_SCB_HEAD);
while (!SCBID_IS_NULL(scbid)) {
-
ahd_set_scbptr(ahd, scbid);
next_scbid = ahd_inw_scbram(ahd, SCB_NEXT_COMPLETE);
scb = ahd_lookup_scb(ahd, scbid);
@@ -762,7 +759,6 @@ ahd_run_data_fifo(struct ahd_softc *ahd, struct scb *s
*/
if ((ahd_inb(ahd, DFSTATUS) & PRELOAD_AVAIL) != 0
&& (ahd_inb(ahd, DFCNTRL) & HDMAENACK) != 0) {
-
/*
* Determine the offset of the next S/G
* element to load.
@@ -819,7 +815,6 @@
svn commit: r365106 - head/sys/dev/al_eth
Author: mjg
Date: Tue Sep 1 21:37:35 2020
New Revision: 365106
URL: https://svnweb.freebsd.org/changeset/base/365106
Log:
al_eth: clean up empty lines in .c and .h files
Modified:
head/sys/dev/al_eth/al_eth.c
head/sys/dev/al_eth/al_init_eth_kr.c
head/sys/dev/al_eth/al_init_eth_lm.c
head/sys/dev/al_eth/al_init_eth_lm.h
Modified: head/sys/dev/al_eth/al_eth.c
==
--- head/sys/dev/al_eth/al_eth.cTue Sep 1 21:37:14 2020
(r365105)
+++ head/sys/dev/al_eth/al_eth.cTue Sep 1 21:37:35 2020
(r365106)
@@ -2168,7 +2168,6 @@ __al_eth_free_irq(struct al_eth_adapter *adapter)
if (rc != 0)
device_printf(adapter->dev, "failed to tear "
"down irq: %d\n", irq->vector);
-
}
irq->requested = 0;
}
Modified: head/sys/dev/al_eth/al_init_eth_kr.c
==
--- head/sys/dev/al_eth/al_init_eth_kr.cTue Sep 1 21:37:14 2020
(r365105)
+++ head/sys/dev/al_eth/al_init_eth_kr.cTue Sep 1 21:37:35 2020
(r365106)
@@ -707,7 +707,6 @@ al_eth_kr_run_lt(struct al_eth_kr_data *kr_data)
if (al_eth_kr_lt_frame_lock_wait(kr_data->adapter, AL_ETH_AN__LT_LANE_0,
AL_ETH_KR_FRAME_LOCK_TIMEOUT) == TRUE) {
-
/*
* when locked, for the first time initialize the receiver and
* transmitter tasks to prepare it for detecting coefficient
@@ -755,7 +754,6 @@ al_eth_kr_run_lt(struct al_eth_kr_data *kr_data)
}
} else {
-
al_info("[%s] FAILED: did not achieve initial frame lock...\n",
kr_data->adapter->name);
Modified: head/sys/dev/al_eth/al_init_eth_lm.c
==
--- head/sys/dev/al_eth/al_init_eth_lm.cTue Sep 1 21:37:14 2020
(r365105)
+++ head/sys/dev/al_eth/al_init_eth_lm.cTue Sep 1 21:37:35 2020
(r365106)
@@ -551,7 +551,6 @@ al_eth_serdes_static_rx_params_set(struct al_eth_lm_co
lm_context->lane,
_context->rx_params_override);
-
} else if (lm_context->static_values != 0) {
lm_context->rx_param_dirty = 0;
@@ -989,7 +988,6 @@ static int al_eth_lm_retimer_ds25_full_config(struct a
config_rx_size = AL_ARR_SIZE(retimer_ds25_10g_mode);
}
-
rc = al_eth_lm_retimer_ds25_channel_config(lm_context,
lm_context->retimer_channel,
config_rx,
@@ -1357,7 +1355,6 @@ al_eth_lm_link_establish(struct al_eth_lm_context *lm_
DELAY(AL_ETH_LM_GEARBOX_RESET_DELAY);
}
-
if (lm_context->retimer_exist) {
DELAY(AL_ETH_LM_RETIMER_LINK_STATUS_DELAY);
@@ -1393,7 +1390,6 @@ al_eth_lm_link_establish(struct al_eth_lm_context *lm_
lm_debug("%s: link is up with LT\n", __func__);
return (0);
}
-
}
lm_context->link_training_failures++;
Modified: head/sys/dev/al_eth/al_init_eth_lm.h
==
--- head/sys/dev/al_eth/al_init_eth_lm.hTue Sep 1 21:37:14 2020
(r365105)
+++ head/sys/dev/al_eth/al_init_eth_lm.hTue Sep 1 21:37:35 2020
(r365106)
@@ -133,7 +133,6 @@ struct al_eth_lm_led_config_data {
enum al_eth_lm_led_config_speed speed;
};
-
struct al_eth_lm_context {
struct al_hal_eth_adapter *adapter;
struct al_serdes_grp_obj*serdes_obj;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365104 - head/sys/dev/ahci
Author: mjg
Date: Tue Sep 1 21:36:40 2020
New Revision: 365104
URL: https://svnweb.freebsd.org/changeset/base/365104
Log:
ahci: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ahci/ahci.c
head/sys/dev/ahci/ahci.h
head/sys/dev/ahci/ahci_pci.c
Modified: head/sys/dev/ahci/ahci.c
==
--- head/sys/dev/ahci/ahci.cTue Sep 1 21:35:39 2020(r365103)
+++ head/sys/dev/ahci/ahci.cTue Sep 1 21:36:40 2020(r365104)
@@ -148,7 +148,6 @@ ahci_ctlr_reset(device_t dev)
if ((ATA_INL(ctlr->r_mem, AHCI_VS) >= 0x00010200) &&
(ATA_INL(ctlr->r_mem, AHCI_CAP2) & AHCI_CAP2_BOH) &&
((v = ATA_INL(ctlr->r_mem, AHCI_BOHC)) & AHCI_BOHC_OOS) == 0) {
-
/* Request OS ownership. */
ATA_OUTL(ctlr->r_mem, AHCI_BOHC, v | AHCI_BOHC_OOS);
@@ -192,7 +191,6 @@ ahci_ctlr_reset(device_t dev)
return (0);
}
-
int
ahci_attach(device_t dev)
Modified: head/sys/dev/ahci/ahci.h
==
--- head/sys/dev/ahci/ahci.hTue Sep 1 21:35:39 2020(r365103)
+++ head/sys/dev/ahci/ahci.hTue Sep 1 21:36:40 2020(r365104)
@@ -679,4 +679,3 @@ struct ahci_channel * ahci_getch(device_t dev, int n);
void ahci_putch(struct ahci_channel *ch);
extern devclass_t ahci_devclass;
-
Modified: head/sys/dev/ahci/ahci_pci.c
==
--- head/sys/dev/ahci/ahci_pci.cTue Sep 1 21:35:39 2020
(r365103)
+++ head/sys/dev/ahci/ahci_pci.cTue Sep 1 21:36:40 2020
(r365104)
@@ -545,7 +545,6 @@ ahci_pci_attach(device_t dev)
}
}
-
if (ctlr->quirks & AHCI_Q_NOMSIX)
msix_count = 0;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365101 - head/sys/dev/ae
Author: mjg
Date: Tue Sep 1 21:34:58 2020
New Revision: 365101
URL: https://svnweb.freebsd.org/changeset/base/365101
Log:
if_ae: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ae/if_ae.c
head/sys/dev/ae/if_aevar.h
Modified: head/sys/dev/ae/if_ae.c
==
--- head/sys/dev/ae/if_ae.c Tue Sep 1 21:34:41 2020(r365100)
+++ head/sys/dev/ae/if_ae.c Tue Sep 1 21:34:58 2020(r365101)
@@ -166,7 +166,6 @@ static device_method_t ae_methods[] = {
DEVMETHOD(miibus_readreg, ae_miibus_readreg),
DEVMETHOD(miibus_writereg, ae_miibus_writereg),
DEVMETHOD(miibus_statchg, ae_miibus_statchg),
-
{ NULL, NULL }
};
static driver_t ae_driver = {
@@ -314,7 +313,7 @@ ae_attach(device_t dev)
goto fail;
}
}
-
+
ae_init_tunables(sc);
ae_phy_reset(sc); /* Reset PHY. */
@@ -399,7 +398,7 @@ ae_attach(device_t dev)
fail:
if (error != 0)
ae_detach(dev);
-
+
return (error);
}
@@ -503,7 +502,7 @@ ae_reset(ae_softc_t *sc)
AE_WRITE_4(sc, AE_MASTER_REG, AE_MASTER_SOFT_RESET);
bus_barrier(sc->mem[0], AE_MASTER_REG, 4,
BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
-
+
/*
* Wait for reset to complete.
*/
@@ -1022,7 +1021,7 @@ ae_get_vpd_eaddr(ae_softc_t *sc, uint32_t *eaddr)
if (found < 2)
return (ENOENT);
-
+
eaddr[1] &= 0x; /* Only last 2 bytes are used. */
if (AE_CHECK_EADDR_VALID(eaddr) != 0) {
if (bootverbose)
@@ -1288,7 +1287,7 @@ static void
ae_powersave_disable(ae_softc_t *sc)
{
uint32_t val;
-
+
AE_LOCK_ASSERT(sc);
AE_PHY_WRITE(sc, AE_PHY_DBG_ADDR, 0);
@@ -1304,7 +1303,7 @@ static void
ae_powersave_enable(ae_softc_t *sc)
{
uint32_t val;
-
+
AE_LOCK_ASSERT(sc);
/*
@@ -1430,7 +1429,7 @@ static unsigned int
ae_tx_avail_size(ae_softc_t *sc)
{
unsigned int avail;
-
+
if (sc->txd_cur >= sc->txd_ack)
avail = AE_TXD_BUFSIZE_DEFAULT - (sc->txd_cur - sc->txd_ack);
else
@@ -1451,7 +1450,7 @@ ae_encap(ae_softc_t *sc, struct mbuf **m_head)
m0 = *m_head;
len = m0->m_pkthdr.len;
-
+
if ((sc->flags & AE_FLAG_TXAVAIL) == 0 ||
len + sizeof(ae_txd_t) + 3 > ae_tx_avail_size(sc)) {
#ifdef AE_DEBUG
@@ -1599,7 +1598,7 @@ ae_link_task(void *arg, int pending)
AE_UNLOCK(sc); /* XXX: could happen? */
return;
}
-
+
sc->flags &= ~AE_FLAG_LINK;
if ((mii->mii_media_status & (IFM_AVALID | IFM_ACTIVE)) ==
(IFM_AVALID | IFM_ACTIVE)) {
Modified: head/sys/dev/ae/if_aevar.h
==
--- head/sys/dev/ae/if_aevar.h Tue Sep 1 21:34:41 2020(r365100)
+++ head/sys/dev/ae/if_aevar.h Tue Sep 1 21:34:58 2020(r365101)
@@ -123,7 +123,7 @@ typedef struct ae_softc {
struct task int_task;
struct task link_task;
struct taskqueue*tq;
-
+
/* DMA tags. */
bus_dma_tag_t dma_parent_tag;
bus_dma_tag_t dma_rxd_tag;
@@ -136,7 +136,7 @@ typedef struct ae_softc {
bus_addr_t dma_rxd_busaddr;
bus_addr_t dma_txd_busaddr;
bus_addr_t dma_txs_busaddr;
-
+
char*rxd_base_dma; /* Start of allocated area. */
ae_rxd_t*rxd_base; /* Start of RxD ring. */
char*txd_base; /* Start of TxD ring. */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365102 - head/sys/dev/age
Author: mjg
Date: Tue Sep 1 21:35:14 2020
New Revision: 365102
URL: https://svnweb.freebsd.org/changeset/base/365102
Log:
if_age: clean up empty lines in .c and .h files
Modified:
head/sys/dev/age/if_age.c
head/sys/dev/age/if_agevar.h
Modified: head/sys/dev/age/if_age.c
==
--- head/sys/dev/age/if_age.c Tue Sep 1 21:34:58 2020(r365101)
+++ head/sys/dev/age/if_age.c Tue Sep 1 21:35:14 2020(r365102)
@@ -156,7 +156,6 @@ static int sysctl_int_range(SYSCTL_HANDLER_ARGS, int,
static int sysctl_hw_age_proc_limit(SYSCTL_HANDLER_ARGS);
static int sysctl_hw_age_int_mod(SYSCTL_HANDLER_ARGS);
-
static device_method_t age_methods[] = {
/* Device interface. */
DEVMETHOD(device_probe, age_probe),
@@ -170,7 +169,6 @@ static device_method_t age_methods[] = {
DEVMETHOD(miibus_readreg, age_miibus_readreg),
DEVMETHOD(miibus_writereg, age_miibus_writereg),
DEVMETHOD(miibus_statchg, age_miibus_statchg),
-
{ NULL, NULL }
};
@@ -565,7 +563,6 @@ age_attach(device_t dev)
device_printf(dev, "cannot allocate IRQ resources.\n");
goto fail;
}
-
/* Get DMA parameters from PCIe device control register. */
if (pci_find_cap(dev, PCIY_EXPRESS, ) == 0) {
Modified: head/sys/dev/age/if_agevar.h
==
--- head/sys/dev/age/if_agevar.hTue Sep 1 21:34:58 2020
(r365101)
+++ head/sys/dev/age/if_agevar.hTue Sep 1 21:35:14 2020
(r365102)
@@ -249,7 +249,6 @@ struct age_softc {
#define AGE_UNLOCK(_sc)mtx_unlock(&(_sc)->age_mtx)
#define AGE_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->age_mtx, MA_OWNED)
-
#defineAGE_COMMIT_MBOX(_sc)
\
do { \
CSR_WRITE_4(_sc, AGE_MBOX, \
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365103 - head/sys/dev/agp
Author: mjg
Date: Tue Sep 1 21:35:39 2020
New Revision: 365103
URL: https://svnweb.freebsd.org/changeset/base/365103
Log:
agp: clean up empty lines in .c and .h files
Modified:
head/sys/dev/agp/agp.c
head/sys/dev/agp/agp_ali.c
head/sys/dev/agp/agp_amd.c
head/sys/dev/agp/agp_amd64.c
head/sys/dev/agp/agp_apple.c
head/sys/dev/agp/agp_ati.c
head/sys/dev/agp/agp_i810.c
head/sys/dev/agp/agp_intel.c
head/sys/dev/agp/agp_nvidia.c
head/sys/dev/agp/agp_sis.c
head/sys/dev/agp/agp_via.c
Modified: head/sys/dev/agp/agp.c
==
--- head/sys/dev/agp/agp.c Tue Sep 1 21:35:14 2020(r365102)
+++ head/sys/dev/agp/agp.c Tue Sep 1 21:35:39 2020(r365103)
@@ -93,7 +93,6 @@ agp_find_caps(device_t dev)
{
int capreg;
-
if (pci_find_cap(dev, PCIY_AGP, ) != 0)
capreg = 0;
return (capreg);
@@ -357,7 +356,7 @@ agp_v3_enable(device_t dev, device_t mdev, u_int32_t m
fw = (AGP_MODE_GET_FW(tstatus)
& AGP_MODE_GET_FW(mstatus)
& AGP_MODE_GET_FW(mode));
-
+
/* Figure out the max rate */
rate = (AGP_MODE_GET_RATE(tstatus)
& AGP_MODE_GET_RATE(mstatus)
@@ -563,7 +562,7 @@ agp_generic_bind_memory(device_t dev, struct agp_memor
i = 0;
goto bad;
}
-
+
/*
* Bind the individual pages and flush the chipset's
* TLB.
@@ -637,7 +636,6 @@ agp_generic_unbind_memory(device_t dev, struct agp_mem
mtx_unlock(>as_lock);
return EINVAL;
}
-
/*
* Unbind the individual pages and flush the chipset's
Modified: head/sys/dev/agp/agp_ali.c
==
--- head/sys/dev/agp/agp_ali.c Tue Sep 1 21:35:14 2020(r365102)
+++ head/sys/dev/agp/agp_ali.c Tue Sep 1 21:35:39 2020(r365103)
@@ -130,7 +130,7 @@ agp_ali_attach(device_t dev)
attbase = pci_read_config(dev, AGP_ALI_ATTBASE, 4);
pci_write_config(dev, AGP_ALI_ATTBASE, gatt->ag_physical |
(attbase & 0xfff), 4);
-
+
/* Enable the TLB. */
pci_write_config(dev, AGP_ALI_TLBCTRL, 0x10, 1);
@@ -256,7 +256,6 @@ static device_method_t agp_ali_methods[] = {
DEVMETHOD(agp_free_memory, agp_generic_free_memory),
DEVMETHOD(agp_bind_memory, agp_generic_bind_memory),
DEVMETHOD(agp_unbind_memory,agp_generic_unbind_memory),
-
{ 0, 0 }
};
Modified: head/sys/dev/agp/agp_amd.c
==
--- head/sys/dev/agp/agp_amd.c Tue Sep 1 21:35:14 2020(r365102)
+++ head/sys/dev/agp/agp_amd.c Tue Sep 1 21:35:39 2020(r365103)
@@ -252,7 +252,7 @@ agp_amd_attach(device_t dev)
/* Install the gatt. */
WRITE4(AGP_AMD751_ATTBASE, gatt->ag_pdir);
-
+
/* Enable synchronisation between host and agp. */
pci_write_config(dev,
AGP_AMD751_MODECTRL,
@@ -281,10 +281,10 @@ agp_amd_detach(device_t dev)
/* Disable the TLB.. */
WRITE2(AGP_AMD751_STATUS,
READ2(AGP_AMD751_STATUS) & ~AGP_AMD751_STATUS_GCE);
-
+
/* Disable host-agp sync */
pci_write_config(dev, AGP_AMD751_MODECTRL, 0x00, 1);
-
+
/* Clear the GATT base */
WRITE4(AGP_AMD751_ATTBASE, 0);
@@ -327,7 +327,7 @@ agp_amd_set_aperture(device_t dev, u_int32_t aperture)
return EINVAL;
vas = ffs(aperture / 32*1024*1024) - 1;
-
+
/*
* While the size register is bits 1-3 of APCTRL, bit 0 must be
* set for the size value to be 'valid'
@@ -395,7 +395,6 @@ static device_method_t agp_amd_methods[] = {
DEVMETHOD(agp_free_memory, agp_generic_free_memory),
DEVMETHOD(agp_bind_memory, agp_generic_bind_memory),
DEVMETHOD(agp_unbind_memory,agp_generic_unbind_memory),
-
{ 0, 0 }
};
Modified: head/sys/dev/agp/agp_amd64.c
==
--- head/sys/dev/agp/agp_amd64.cTue Sep 1 21:35:14 2020
(r365102)
+++ head/sys/dev/agp/agp_amd64.cTue Sep 1 21:35:39 2020
(r365103)
@@ -499,7 +499,6 @@ static device_method_t agp_amd64_methods[] = {
DEVMETHOD(agp_free_memory, agp_generic_free_memory),
DEVMETHOD(agp_bind_memory, agp_generic_bind_memory),
DEVMETHOD(agp_unbind_memory,agp_generic_unbind_memory),
-
{ 0, 0 }
};
Modified: head/sys/dev/agp/agp_apple.c
==
--- head/sys/dev/agp/agp_apple.cTue Sep 1 21:35:14 2020
(r365102)
+++ head/sys/dev/agp/agp_apple.cTue Sep 1 21:35:39 2020
(r365103)
@@ -155,7 +155,7
svn commit: r365100 - head/sys/dev/adlink
Author: mjg
Date: Tue Sep 1 21:34:41 2020
New Revision: 365100
URL: https://svnweb.freebsd.org/changeset/base/365100
Log:
adlink: clean up empty lines in .c and .h files
Modified:
head/sys/dev/adlink/adlink.c
Modified: head/sys/dev/adlink/adlink.c
==
--- head/sys/dev/adlink/adlink.cTue Sep 1 21:34:24 2020
(r365099)
+++ head/sys/dev/adlink/adlink.cTue Sep 1 21:34:41 2020
(r365100)
@@ -199,7 +199,7 @@ adlink_ioctl(struct cdev *dev, u_long cmd, caddr_t dat
u_int u;
struct pgstat *pg;
uint64_t *sample;
-
+
sc = dev->si_drv1;
u = *(u_int*)data;
error = 0;
@@ -430,7 +430,7 @@ static device_method_t adlink_methods[] = {
DEVMETHOD_END
};
-
+
static driver_t adlink_driver = {
"adlink",
adlink_methods,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365099 - head/sys/dev/adb
Author: mjg
Date: Tue Sep 1 21:34:24 2020
New Revision: 365099
URL: https://svnweb.freebsd.org/changeset/base/365099
Log:
adb: clean up empty lines in .c and .h files
Modified:
head/sys/dev/adb/adb.h
head/sys/dev/adb/adb_bus.c
head/sys/dev/adb/adb_buttons.c
head/sys/dev/adb/adb_kbd.c
head/sys/dev/adb/adb_mouse.c
head/sys/dev/adb/adbvar.h
Modified: head/sys/dev/adb/adb.h
==
--- head/sys/dev/adb/adb.h Tue Sep 1 21:34:04 2020(r365098)
+++ head/sys/dev/adb/adb.h Tue Sep 1 21:34:24 2020(r365099)
@@ -45,7 +45,7 @@ enum {
ADB_DEVICE_MOUSE= 0x03,
ADB_DEVICE_TABLET = 0x04,
ADB_DEVICE_MODEM= 0x05,
-
+
ADB_DEVICE_MISC = 0x07
};
@@ -78,4 +78,3 @@ extern devclass_t adb_devclass;
extern driver_t adb_driver;
#endif
-
Modified: head/sys/dev/adb/adb_bus.c
==
--- head/sys/dev/adb/adb_bus.c Tue Sep 1 21:34:04 2020(r365098)
+++ head/sys/dev/adb/adb_bus.c Tue Sep 1 21:34:24 2020(r365099)
@@ -99,13 +99,13 @@ adb_bus_attach(device_t dev)
* the bus. Enumerating the ADB involves receiving packets,
* which works best with interrupts enabled.
*/
-
+
if (config_intrhook_establish(>enum_hook) != 0)
return (ENOMEM);
return (0);
}
-
+
static void
adb_bus_enumerate(void *xdev)
{
@@ -127,7 +127,7 @@ adb_bus_enumerate(void *xdev)
sc->devinfo[i].address = i;
sc->devinfo[i].default_address = 0;
}
-
+
/* Reset ADB bus */
adb_send_raw_packet_sync(dev,0,ADB_COMMAND_BUS_RESET,0,0,NULL,NULL);
DELAY(1500);
@@ -142,7 +142,7 @@ adb_bus_enumerate(void *xdev)
do {
reply = adb_send_raw_packet_sync(dev,i,
ADB_COMMAND_TALK,3,0,NULL,NULL);
-
+
if (reply) {
/* If we got a response, relocate to next_free */
r3 = sc->devinfo[i].register3;
@@ -197,7 +197,6 @@ static int adb_bus_detach(device_t dev)
{
return (bus_generic_detach(dev));
}
-
static void
adb_probe_nomatch(device_t dev, device_t child)
@@ -234,7 +233,7 @@ adb_receive_raw_packet(device_t dev, u_char status, u_
ADB_RECEIVE_PACKET(sc->children[addr],status,
(command & 0x0f) >> 2,command & 0x03,len,data);
}
-
+
return (0);
}
@@ -243,9 +242,9 @@ adb_print_child(device_t dev, device_t child)
{
struct adb_devinfo *dinfo;
int retval = 0;
-
+
dinfo = device_get_ivars(child);
-
+
retval += bus_print_child_header(dev,child);
printf(" at device %d",dinfo->address);
retval += bus_print_child_footer(dev, child);
@@ -262,7 +261,7 @@ adb_send_packet(device_t dev, u_char command, u_char r
sc = device_get_softc(device_get_parent(dev));
dinfo = device_get_ivars(dev);
-
+
command_byte |= dinfo->address << 4;
command_byte |= command << 2;
command_byte |= reg;
@@ -281,7 +280,7 @@ adb_set_autopoll(device_t dev, u_char enable)
sc = device_get_softc(device_get_parent(dev));
dinfo = device_get_ivars(dev);
-
+
mod = enable << dinfo->address;
if (enable) {
sc->autopoll_mask |= mod;
@@ -323,7 +322,7 @@ adb_send_raw_packet_sync(device_t dev, uint8_t to, uin
int i = 1;
sc = device_get_softc(dev);
-
+
command_byte |= to << 4;
command_byte |= command << 2;
command_byte |= reg;
@@ -410,13 +409,13 @@ adb_write_register(device_t dev, u_char reg, size_t le
struct adb_softc *sc;
struct adb_devinfo *dinfo;
size_t result;
-
+
dinfo = device_get_ivars(dev);
sc = device_get_softc(device_get_parent(dev));
-
+
result = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address,
ADB_COMMAND_LISTEN, reg, len, (u_char *)data, NULL);
-
+
result = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address,
ADB_COMMAND_TALK, reg, 0, NULL, NULL);
Modified: head/sys/dev/adb/adb_buttons.c
==
--- head/sys/dev/adb/adb_buttons.c Tue Sep 1 21:34:04 2020
(r365098)
+++ head/sys/dev/adb/adb_buttons.c Tue Sep 1 21:34:24 2020
(r365099)
@@ -69,7 +69,6 @@ static device_method_t abtn_methods[] = {
/* ADB interface */
DEVMETHOD(adb_receive_packet, abtn_receive_packet),
-
{ 0, 0 }
};
@@ -159,4 +158,3 @@ abtn_receive_packet(device_t dev, u_char status,
}
return 0;
}
-
Modified: head/sys/dev/adb/adb_kbd.c
svn commit: r365097 - in head/sys/dev/rtwn: . pci rtl8188e rtl8188e/pci rtl8188e/usb rtl8192c rtl8192c/pci rtl8192c/usb rtl8192e rtl8192e/usb rtl8812a rtl8812a/usb rtl8821a rtl8821a/usb usb
Author: mjg Date: Tue Sep 1 21:33:31 2020 New Revision: 365097 URL: https://svnweb.freebsd.org/changeset/base/365097 Log: rtwn: clean up empty lines in .c and .h files Modified: head/sys/dev/rtwn/if_rtwn.c head/sys/dev/rtwn/if_rtwn_beacon.c head/sys/dev/rtwn/if_rtwn_calib.c head/sys/dev/rtwn/if_rtwn_cam.c head/sys/dev/rtwn/if_rtwn_efuse.c head/sys/dev/rtwn/if_rtwn_fw.c head/sys/dev/rtwn/if_rtwn_fw.h head/sys/dev/rtwn/if_rtwn_ridx.h head/sys/dev/rtwn/if_rtwn_rx.c head/sys/dev/rtwn/if_rtwn_rx.h head/sys/dev/rtwn/if_rtwn_task.c head/sys/dev/rtwn/if_rtwn_tx.c head/sys/dev/rtwn/if_rtwnreg.h head/sys/dev/rtwn/if_rtwnvar.h head/sys/dev/rtwn/pci/rtwn_pci_attach.c head/sys/dev/rtwn/pci/rtwn_pci_reg.c head/sys/dev/rtwn/pci/rtwn_pci_rx.c head/sys/dev/rtwn/pci/rtwn_pci_tx.c head/sys/dev/rtwn/pci/rtwn_pci_var.h head/sys/dev/rtwn/rtl8188e/pci/r88ee.h head/sys/dev/rtwn/rtl8188e/pci/r88ee_reg.h head/sys/dev/rtwn/rtl8188e/r88e.h head/sys/dev/rtwn/rtl8188e/r88e_beacon.c head/sys/dev/rtwn/rtl8188e/r88e_calib.c head/sys/dev/rtwn/rtl8188e/r88e_chan.c head/sys/dev/rtwn/rtl8188e/r88e_fw.c head/sys/dev/rtwn/rtl8188e/r88e_init.c head/sys/dev/rtwn/rtl8188e/r88e_led.c head/sys/dev/rtwn/rtl8188e/r88e_priv.h head/sys/dev/rtwn/rtl8188e/r88e_reg.h head/sys/dev/rtwn/rtl8188e/r88e_rf.c head/sys/dev/rtwn/rtl8188e/r88e_rom.c head/sys/dev/rtwn/rtl8188e/r88e_rx.c head/sys/dev/rtwn/rtl8188e/r88e_tx.c head/sys/dev/rtwn/rtl8188e/usb/r88eu.h head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c head/sys/dev/rtwn/rtl8192c/pci/r92ce.h head/sys/dev/rtwn/rtl8192c/pci/r92ce_attach.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_calib.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_fw.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h head/sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h head/sys/dev/rtwn/rtl8192c/pci/r92ce_rx.c head/sys/dev/rtwn/rtl8192c/pci/r92ce_tx.c head/sys/dev/rtwn/rtl8192c/r92c.h head/sys/dev/rtwn/rtl8192c/r92c_attach.c head/sys/dev/rtwn/rtl8192c/r92c_beacon.c head/sys/dev/rtwn/rtl8192c/r92c_calib.c head/sys/dev/rtwn/rtl8192c/r92c_chan.c head/sys/dev/rtwn/rtl8192c/r92c_fw.c head/sys/dev/rtwn/rtl8192c/r92c_init.c head/sys/dev/rtwn/rtl8192c/r92c_priv.h head/sys/dev/rtwn/rtl8192c/r92c_reg.h head/sys/dev/rtwn/rtl8192c/r92c_rf.c head/sys/dev/rtwn/rtl8192c/r92c_rom.c head/sys/dev/rtwn/rtl8192c/r92c_rx.c head/sys/dev/rtwn/rtl8192c/r92c_tx.c head/sys/dev/rtwn/rtl8192c/r92c_tx_desc.h head/sys/dev/rtwn/rtl8192c/usb/r92cu.h head/sys/dev/rtwn/rtl8192c/usb/r92cu_attach.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_led.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h head/sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h head/sys/dev/rtwn/rtl8192c/usb/r92cu_rx.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx.c head/sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h head/sys/dev/rtwn/rtl8192e/r92e.h head/sys/dev/rtwn/rtl8192e/r92e_chan.c head/sys/dev/rtwn/rtl8192e/r92e_priv.h head/sys/dev/rtwn/rtl8192e/usb/r92eu.h head/sys/dev/rtwn/rtl8812a/r12a.h head/sys/dev/rtwn/rtl8812a/r12a_beacon.c head/sys/dev/rtwn/rtl8812a/r12a_calib.c head/sys/dev/rtwn/rtl8812a/r12a_caps.c head/sys/dev/rtwn/rtl8812a/r12a_chan.c head/sys/dev/rtwn/rtl8812a/r12a_fw.c head/sys/dev/rtwn/rtl8812a/r12a_fw_cmd.h head/sys/dev/rtwn/rtl8812a/r12a_init.c head/sys/dev/rtwn/rtl8812a/r12a_led.c head/sys/dev/rtwn/rtl8812a/r12a_priv.h head/sys/dev/rtwn/rtl8812a/r12a_reg.h head/sys/dev/rtwn/rtl8812a/r12a_rf.c head/sys/dev/rtwn/rtl8812a/r12a_rom.c head/sys/dev/rtwn/rtl8812a/r12a_rx.c head/sys/dev/rtwn/rtl8812a/r12a_tx.c head/sys/dev/rtwn/rtl8812a/r12a_tx_desc.h head/sys/dev/rtwn/rtl8812a/usb/r12au.h head/sys/dev/rtwn/rtl8812a/usb/r12au_attach.c head/sys/dev/rtwn/rtl8812a/usb/r12au_init.c head/sys/dev/rtwn/rtl8812a/usb/r12au_rx.c head/sys/dev/rtwn/rtl8812a/usb/r12au_tx.c head/sys/dev/rtwn/rtl8821a/r21a.h head/sys/dev/rtwn/rtl8821a/r21a_beacon.c head/sys/dev/rtwn/rtl8821a/r21a_calib.c head/sys/dev/rtwn/rtl8821a/r21a_chan.c head/sys/dev/rtwn/rtl8821a/r21a_fw.c head/sys/dev/rtwn/rtl8821a/r21a_init.c head/sys/dev/rtwn/rtl8821a/r21a_led.c head/sys/dev/rtwn/rtl8821a/r21a_priv.h head/sys/dev/rtwn/rtl8821a/r21a_reg.h head/sys/dev/rtwn/rtl8821a/r21a_rom.c head/sys/dev/rtwn/rtl8821a/r21a_rx.c head/sys/dev/rtwn/rtl8821a/usb/r21au.h head/sys/dev/rtwn/rtl8821a/usb/r21au_attach.c head/sys/dev/rtwn/rtl8821a/usb/r21au_dfs.c head/sys/dev/rtwn/rtl8821a/usb/r21au_init.c head/sys/dev/rtwn/usb/rtwn_usb_attach.c head/sys/dev/rtwn/usb/rtwn_usb_ep.c head/sys/dev/rtwn/usb/rtwn_usb_reg.c head/sys/dev/rtwn/usb/rtwn_usb_tx.c Modified: head/sys/dev/rtwn/if_rtwn.c == --- head/sys/dev/rtwn/if_rtwn.c Tue Sep 1 21:32:41 2020(r365096) +++
svn commit: r365098 - head/sys/dev/acpi_support
Author: mjg
Date: Tue Sep 1 21:34:04 2020
New Revision: 365098
URL: https://svnweb.freebsd.org/changeset/base/365098
Log:
acpi_support: clean up empty lines in .c and .h files
Modified:
head/sys/dev/acpi_support/acpi_asus.c
head/sys/dev/acpi_support/acpi_asus_wmi.c
head/sys/dev/acpi_support/acpi_fujitsu.c
head/sys/dev/acpi_support/acpi_hp.c
head/sys/dev/acpi_support/acpi_panasonic.c
head/sys/dev/acpi_support/acpi_rapidstart.c
head/sys/dev/acpi_support/acpi_wmi.c
Modified: head/sys/dev/acpi_support/acpi_asus.c
==
--- head/sys/dev/acpi_support/acpi_asus.c Tue Sep 1 21:33:31 2020
(r365097)
+++ head/sys/dev/acpi_support/acpi_asus.c Tue Sep 1 21:34:04 2020
(r365098)
@@ -417,7 +417,6 @@ static struct acpi_asus_model acpi_asus_models[] = {
.disp_get = "\\_SB.PCI0.P0P2.VGA.GETD",
.disp_set = "SDSP"
},
-
{ .name = NULL }
};
@@ -434,7 +433,6 @@ static struct acpi_asus_model acpi_samsung_models[] =
.lcd_get= "\\BKLT",
.lcd_set= "\\_SB.PCI0.LPCB.EC0._Q0E"
},
-
{ .name = NULL }
};
@@ -457,7 +455,6 @@ static struct acpi_asus_model acpi_eeepc_models[] = {
.wlan_set = "\\_SB.ATKD.WLDS",
.n_func = acpi_asus_eeepc_notify
},
-
{ .name = NULL }
};
@@ -499,7 +496,6 @@ static struct {
.method = ACPI_ASUS_METHOD_WLAN,
.description= "wireless lan state",
},
-
{ .name = NULL }
};
@@ -524,7 +520,6 @@ static device_method_t acpi_asus_methods[] = {
DEVMETHOD(device_probe, acpi_asus_probe),
DEVMETHOD(device_attach, acpi_asus_attach),
DEVMETHOD(device_detach, acpi_asus_detach),
-
{ 0, 0 }
};
@@ -617,7 +612,6 @@ acpi_asus_probe(device_t dev)
*/
for (model = acpi_asus_models; model->name != NULL; model++) {
if (strncmp(Obj->String.Pointer, model->name, 3) == 0) {
-
good:
sbuf_printf(sb, "Asus %s Laptop Extras",
Obj->String.Pointer);
@@ -867,7 +861,7 @@ acpi_asus_detach(device_t dev)
/* Remove notify handler */
AcpiRemoveNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY,
acpi_asus_notify);
-
+
if (sc->lcdd_handle) {
KASSERT(sc->model->lcdd_n_func != NULL,
("model->lcdd_n_func is NULL, but lcdd_handle is
non-zero"));
@@ -887,7 +881,7 @@ acpi_asus_led_task(struct acpi_asus_led *led, int pend
struct acpi_asus_softc *sc;
char*method;
int state;
-
+
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
sc = led->sc;
@@ -926,7 +920,7 @@ acpi_asus_led_task(struct acpi_asus_led *led, int pend
acpi_SetInteger(sc->handle, method, state);
led->busy = 0;
}
-
+
static void
acpi_asus_led(struct acpi_asus_led *led, int state)
{
@@ -950,7 +944,7 @@ acpi_asus_sysctl(SYSCTL_HANDLER_ARGS)
int error = 0;
int function;
int method;
-
+
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
sc = (struct acpi_asus_softc *)oidp->oid_arg1;
Modified: head/sys/dev/acpi_support/acpi_asus_wmi.c
==
--- head/sys/dev/acpi_support/acpi_asus_wmi.c Tue Sep 1 21:33:31 2020
(r365097)
+++ head/sys/dev/acpi_support/acpi_asus_wmi.c Tue Sep 1 21:34:04 2020
(r365098)
@@ -104,7 +104,6 @@ ACPI_MODULE_NAME("ASUS-WMI")
#define ASUS_WMI_DSTS_BRIGHTNESS_MASK 0x00FF
#define ASUS_WMI_DSTS_MAX_BRIGTH_MASK 0xFF00
-
struct acpi_asus_wmi_softc {
device_tdev;
device_twmi_dev;
@@ -450,7 +449,7 @@ static int
acpi_asus_wmi_detach(device_t dev)
{
struct acpi_asus_wmi_softc *sc = device_get_softc(dev);
-
+
ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
if (sc->notify_guid)
@@ -468,7 +467,7 @@ acpi_asus_wmi_sysctl(SYSCTL_HANDLER_ARGS)
int error = 0;
int function;
int dev_id;
-
+
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
sc = (struct acpi_asus_wmi_softc *)oidp->oid_arg1;
@@ -601,7 +600,7 @@ acpi_asus_wmi_evaluate_method(device_t wmi_dev, int me
ACPI_OBJECT *obj;
ACPI_BUFFER in = { sizeof(params), };
ACPI_BUFFER out = { ACPI_ALLOCATE_BUFFER, NULL };
-
+
if (ACPI_FAILURE(ACPI_WMI_EVALUATE_CALL(wmi_dev,
ACPI_ASUS_WMI_MGMT_GUID, 1, method, , ))) {
acpi_asus_wmi_free_buffer();
Modified: head/sys/dev/acpi_support/acpi_fujitsu.c
svn commit: r365096 - in head/sys/dev/acpica: . Osd
Author: mjg
Date: Tue Sep 1 21:32:41 2020
New Revision: 365096
URL: https://svnweb.freebsd.org/changeset/base/365096
Log:
acpica: clean up empty lines in .c and .h files
Modified:
head/sys/dev/acpica/Osd/OsdHardware.c
head/sys/dev/acpica/acpi.c
head/sys/dev/acpica/acpi_acad.c
head/sys/dev/acpica/acpi_cpu.c
head/sys/dev/acpica/acpi_isab.c
head/sys/dev/acpica/acpi_pci.c
head/sys/dev/acpica/acpi_pci_link.c
head/sys/dev/acpica/acpi_powerres.c
head/sys/dev/acpica/acpi_smbus.h
head/sys/dev/acpica/acpi_thermal.c
head/sys/dev/acpica/acpi_timer.c
head/sys/dev/acpica/acpivar.h
Modified: head/sys/dev/acpica/Osd/OsdHardware.c
==
--- head/sys/dev/acpica/Osd/OsdHardware.c Tue Sep 1 21:32:25 2020
(r365095)
+++ head/sys/dev/acpica/Osd/OsdHardware.c Tue Sep 1 21:32:41 2020
(r365096)
@@ -119,7 +119,6 @@ AcpiOsReadPciConfiguration(ACPI_PCI_ID *PciId, UINT32
#endif
}
-
ACPI_STATUS
AcpiOsWritePciConfiguration (ACPI_PCI_ID *PciId, UINT32 Register,
UINT64 Value, UINT32 Width)
Modified: head/sys/dev/acpica/acpi.c
==
--- head/sys/dev/acpica/acpi.c Tue Sep 1 21:32:25 2020(r365095)
+++ head/sys/dev/acpica/acpi.c Tue Sep 1 21:32:41 2020(r365096)
@@ -1709,7 +1709,7 @@ acpi_device_id_probe(device_t bus, device_t dev, char
rv = acpi_MatchHid(h, ids[i]);
if (rv == ACPI_MATCHHID_NOMATCH)
continue;
-
+
if (match != NULL) {
*match = ids[i];
}
Modified: head/sys/dev/acpica/acpi_acad.c
==
--- head/sys/dev/acpica/acpi_acad.c Tue Sep 1 21:32:25 2020
(r365095)
+++ head/sys/dev/acpica/acpi_acad.c Tue Sep 1 21:32:41 2020
(r365096)
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-
+
/* Hooks for the ACPI CA debugging infrastructure */
#define _COMPONENT ACPI_AC_ADAPTER
ACPI_MODULE_NAME("AC_ADAPTER")
Modified: head/sys/dev/acpica/acpi_cpu.c
==
--- head/sys/dev/acpica/acpi_cpu.c Tue Sep 1 21:32:25 2020
(r365095)
+++ head/sys/dev/acpica/acpi_cpu.c Tue Sep 1 21:32:41 2020
(r365096)
@@ -873,7 +873,6 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *sc)
acpi_PkgInt32(pkg, 1, _ptr->type) != 0 ||
acpi_PkgInt32(pkg, 2, _ptr->trans_lat) != 0 ||
acpi_PkgInt32(pkg, 3, _ptr->power) != 0) {
-
device_printf(sc->cpu_dev, "skipping invalid Cx state package\n");
continue;
}
Modified: head/sys/dev/acpica/acpi_isab.c
==
--- head/sys/dev/acpica/acpi_isab.c Tue Sep 1 21:32:25 2020
(r365095)
+++ head/sys/dev/acpica/acpi_isab.c Tue Sep 1 21:32:41 2020
(r365096)
@@ -92,7 +92,7 @@ acpi_isab_probe(device_t dev)
{
static char *isa_ids[] = { "PNP0A05", "PNP0A06", NULL };
int rv;
-
+
if (acpi_disabled("isab") ||
devclass_get_device(isab_devclass, 0) != dev)
return (ENXIO);
Modified: head/sys/dev/acpica/acpi_pci.c
==
--- head/sys/dev/acpica/acpi_pci.c Tue Sep 1 21:32:25 2020
(r365095)
+++ head/sys/dev/acpica/acpi_pci.c Tue Sep 1 21:32:41 2020
(r365096)
@@ -424,7 +424,7 @@ acpi_pci_attach(device_t dev)
acpi_pci_bus_notify_handler, dev);
AcpiWalkNamespace(ACPI_TYPE_DEVICE, acpi_get_handle(dev), 1,
acpi_pci_install_device_notify_handler, NULL, dev, NULL);
-
+
return (0);
}
@@ -479,4 +479,3 @@ acpi_pci_get_dma_tag(device_t bus, device_t child)
return (pci_get_dma_tag(bus, child));
}
#endif
-
Modified: head/sys/dev/acpica/acpi_pci_link.c
==
--- head/sys/dev/acpica/acpi_pci_link.c Tue Sep 1 21:32:25 2020
(r365095)
+++ head/sys/dev/acpica/acpi_pci_link.c Tue Sep 1 21:32:41 2020
(r365096)
@@ -157,7 +157,7 @@ acpi_pci_link_probe(device_t dev)
rv = ACPI_ID_PROBE(device_get_parent(dev), dev, pci_link_ids, NULL);
if (rv > 0)
return (rv);
-
+
if (ACPI_SUCCESS(acpi_short_name(acpi_get_handle(dev), name,
sizeof(name {
snprintf(descr, sizeof(descr), "ACPI PCI Link %s", name);
@@ -811,11 +811,9 @@ acpi_pci_link_srs_from_links(struct acpi_pci_link_soft
srsbuf->Pointer = NULL;
link = sc->pl_links;
for (i = 0; i < sc->pl_num_links; i++) {
-
/* Add a new IRQ resource from each link. */
link = >pl_links[i];
if (link->l_prs_template.Type ==
svn commit: r365095 - head/sys/dev/aacraid
Author: mjg
Date: Tue Sep 1 21:32:25 2020
New Revision: 365095
URL: https://svnweb.freebsd.org/changeset/base/365095
Log:
aacraid: clean up empty lines in .c and .h files
Modified:
head/sys/dev/aacraid/aacraid.c
head/sys/dev/aacraid/aacraid_debug.c
head/sys/dev/aacraid/aacraid_endian.h
head/sys/dev/aacraid/aacraid_reg.h
head/sys/dev/aacraid/aacraid_var.h
Modified: head/sys/dev/aacraid/aacraid.c
==
--- head/sys/dev/aacraid/aacraid.c Tue Sep 1 21:32:07 2020
(r365094)
+++ head/sys/dev/aacraid/aacraid.c Tue Sep 1 21:32:25 2020
(r365095)
@@ -1023,7 +1023,6 @@ aac_command_thread(struct aac_softc *sc)
sc->aifflags = AAC_AIFFLAGS_RUNNING;
while ((sc->aifflags & AAC_AIFFLAGS_EXIT) == 0) {
-
retval = 0;
if ((sc->aifflags & AAC_AIFFLAGS_PENDING) == 0)
retval = msleep(sc->aifthread, >aac_io_lock, PRIBIO,
@@ -1267,7 +1266,6 @@ aac_free_commands(struct aac_softc *sc)
fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
while ((fm = TAILQ_FIRST(>aac_fibmap_tqh)) != NULL) {
-
TAILQ_REMOVE(>aac_fibmap_tqh, fm, fm_link);
/*
* We check against total_fibs to handle partially
@@ -1451,7 +1449,6 @@ aacraid_map_command_sg(void *arg, bus_dma_segment_t *s
}
}
-
static int
aac_convert_sgraw2(struct aac_softc *sc, struct aac_raw_io2 *raw,
int pages, int nseg, int nseg_new)
@@ -1488,7 +1485,6 @@ aac_convert_sgraw2(struct aac_softc *sc, struct aac_ra
return nseg_new;
}
-
/*
* Unmap a command from controller-visible space.
*/
@@ -1851,7 +1847,7 @@ aac_define_int_mode(struct aac_softc *sc)
device_t dev;
int cap, msi_count, error = 0;
uint32_t val;
-
+
dev = sc->aac_dev;
if (sc->flags & AAC_FLAGS_SYNC_MODE) {
@@ -2377,7 +2373,7 @@ aac_src_access_devreg(struct aac_softc *sc, int mode)
AAC_MEM0_SETREG4(sc, AAC_SRC_OIMR,
val & (~(PMC_GLOBAL_INT_BIT2)));
break;
-
+
default:
break;
}
@@ -2398,7 +2394,7 @@ aac_src_send_command(struct aac_softc *sc, struct aac_
if (sc->msi_enabled && cm->cm_fib->Header.Command != AifRequest &&
sc->aac_max_msix > 1) {
u_int16_t vector_no, first_choice = 0x;
-
+
vector_no = sc->aac_fibs_pushed_no % sc->aac_max_msix;
do {
vector_no += 1;
@@ -3102,7 +3098,6 @@ aac_request_aif(struct aac_softc *sc)
aacraid_map_command_sg(cm, NULL, 0, 0);
}
-
/*
* cdevpriv interface private destructor.
Modified: head/sys/dev/aacraid/aacraid_debug.c
==
--- head/sys/dev/aacraid/aacraid_debug.cTue Sep 1 21:32:07 2020
(r365094)
+++ head/sys/dev/aacraid/aacraid_debug.cTue Sep 1 21:32:25 2020
(r365095)
@@ -305,7 +305,7 @@ aacraid_print_aif(struct aac_softc *sc, struct aac_aif
default:
status = "unknown status"; break;
}
-
+
device_printf(sc->aac_dev, "JobProgress (%d) - %s (%d, %d)\n",
aif->seqNumber, status,
aif->data.PR[0].currentTick,
@@ -704,7 +704,6 @@ void aacraid_fw_print_mem(struct aac_softc *sc, unsign
* Bump the offset by 16 for the next line
*/
Offset += 16;
-
}
/*
@@ -713,4 +712,3 @@ void aacraid_fw_print_mem(struct aac_softc *sc, unsign
if (sc != NULL)
sc->FwDebugFlags = DebugFlags;
}
-
Modified: head/sys/dev/aacraid/aacraid_endian.h
==
--- head/sys/dev/aacraid/aacraid_endian.h Tue Sep 1 21:32:07 2020
(r365094)
+++ head/sys/dev/aacraid/aacraid_endian.h Tue Sep 1 21:32:25 2020
(r365095)
@@ -71,7 +71,6 @@
#define aac_blockread64_tole(ptr)
#define aac_blockwrite64_tole(ptr)
-
#else /* _BYTE_ORDER != _LITTLE_ENDIAN */
/* Convert from Little-Endian to host order (TOH) */
Modified: head/sys/dev/aacraid/aacraid_reg.h
==
--- head/sys/dev/aacraid/aacraid_reg.h Tue Sep 1 21:32:07 2020
(r365094)
+++ head/sys/dev/aacraid/aacraid_reg.h Tue Sep 1 21:32:25 2020
(r365095)
@@ -1342,7 +1342,6 @@ typedef enum {
CMUNSTABLE
} AAC_CommitLevel;
-
#defineCT_FIB_PARAMS 6
#defineMAX_FIB_PARAMS 10
#defineCT_PACKET_SIZE \
@@ -1589,7 +1588,6 @@ enum {
/* Sunrise Lake dual core reset */
#define AAC_IRCSR 0x38/* inbound dual
svn commit: r365093 - head/sys/dev/twe
Author: mjg
Date: Tue Sep 1 21:31:50 2020
New Revision: 365093
URL: https://svnweb.freebsd.org/changeset/base/365093
Log:
twe: clean up empty lines in .c and .h files
Modified:
head/sys/dev/twe/twe.c
head/sys/dev/twe/twe_freebsd.c
head/sys/dev/twe/tweio.h
head/sys/dev/twe/twereg.h
head/sys/dev/twe/twevar.h
Modified: head/sys/dev/twe/twe.c
==
--- head/sys/dev/twe/twe.c Tue Sep 1 21:31:38 2020(r365092)
+++ head/sys/dev/twe/twe.c Tue Sep 1 21:31:50 2020(r365093)
@@ -184,10 +184,9 @@ twe_setup(struct twe_softc *sc)
* check for errors, drain the response queue.
*/
for (i = 0; i < TWE_MAX_RESET_TRIES; i++) {
-
if (i > 0)
twe_printf(sc, "reset %d failed, trying again\n", i);
-
+
if (!twe_soft_reset(sc))
break; /* reset process complete */
}
@@ -413,7 +412,6 @@ twe_startio(struct twe_softc *sc)
/* spin until something prevents us from doing any work */
for (;;) {
-
/* try to get a command that's already ready to go */
tr = twe_dequeue_ready(sc);
@@ -447,18 +445,18 @@ twe_startio(struct twe_softc *sc)
biofinish(bp, NULL, EOPNOTSUPP);
break;
}
-
+
/* build a suitable I/O command (assumes 512-byte rounded
transfers) */
cmd->io.size = 3;
cmd->io.unit = *(int *)(bp->bio_driver1);
cmd->io.block_count = (tr->tr_length + TWE_BLOCK_SIZE - 1) /
TWE_BLOCK_SIZE;
cmd->io.lba = bp->bio_pblkno;
}
-
+
/* did we find something to do? */
if (tr == NULL)
break;
-
+
/* try to map and submit the command to controller */
error = twe_map_request(tr);
@@ -578,7 +576,7 @@ twe_ioctl(struct twe_softc *sc, u_long ioctlcmd, void
/* copy the command out again */
bcopy(cmd, >tu_command, sizeof(TWE_Command));
-
+
/* if there was a data buffer, copy it out */
if (tr->tr_length > 0)
error = copyout(tr->tr_data, tu->tu_data, tu->tu_size);
@@ -1024,7 +1022,6 @@ twe_completeio(struct twe_request *tr)
debug_called(4);
if (tr->tr_status == TWE_CMD_COMPLETE) {
-
if (cmd->generic.status)
if (twe_report_request(tr)) {
bp->bio_error = EIO;
@@ -1065,10 +1062,9 @@ twe_reset(struct twe_softc *sc)
* Try to soft-reset the controller.
*/
for (i = 0; i < TWE_MAX_RESET_TRIES; i++) {
-
if (i > 0)
twe_printf(sc, "reset %d failed, trying again\n", i);
-
+
if (!twe_soft_reset(sc))
break; /* reset process complete */
}
@@ -1132,7 +1128,6 @@ twe_start(struct twe_request *tr)
* and let the command be rescheduled.
*/
for (i = 10; (i > 0); i--) {
-
/* check to see if we can post a command */
status_reg = TWE_STATUS(sc);
twe_check_bits(sc, status_reg);
@@ -1541,7 +1536,6 @@ twe_find_aen(struct twe_softc *sc, u_int16_t aen)
return(missing);
}
-
#if 0 /* currently unused */
/
* Sleep waiting for at least (timeout) seconds until we see (aen) as
@@ -1809,7 +1803,6 @@ twe_format_aen(struct twe_softc *sc, u_int16_t aen)
TWE_AEN_UNIT(aen), msg);
return(sc->twe_aen_buf);
-
case 'x':
default:
break;
Modified: head/sys/dev/twe/twe_freebsd.c
==
--- head/sys/dev/twe/twe_freebsd.c Tue Sep 1 21:31:38 2020
(r365092)
+++ head/sys/dev/twe/twe_freebsd.c Tue Sep 1 21:31:50 2020
(r365093)
@@ -709,7 +709,7 @@ twed_open(struct disk *dp)
struct twed_softc *sc = (struct twed_softc *)dp->d_drv1;
debug_called(4);
-
+
if (sc == NULL)
return (ENXIO);
@@ -1065,7 +1065,6 @@ twe_map_request(struct twe_request *tr)
* If the command involves data, map that too.
*/
if (tr->tr_data != NULL && ((tr->tr_flags & TWE_CMD_MAPPED) == 0)) {
-
/*
* Data must be 64-byte aligned; allocate a fixup buffer if it's not.
*/
@@ -1079,7 +1078,7 @@ twe_map_request(struct twe_request *tr)
return(ENOMEM);
}
}
-
+
/*
* Map the data buffer into bus space and build the s/g list.
*/
Modified: head/sys/dev/twe/tweio.h
==
--- head/sys/dev/twe/tweio.hTue Sep 1 21:31:38 2020(r365092)
+++ head/sys/dev/twe/tweio.hTue Sep 1 21:31:50 2020(r365093)
@@ -31,7 +31,6 @@
* $FreeBSD$
*/
-
/*
* User-space command
*
Modified: head/sys/dev/twe/twereg.h
svn commit: r365094 - head/sys/dev/aac
Author: mjg
Date: Tue Sep 1 21:32:07 2020
New Revision: 365094
URL: https://svnweb.freebsd.org/changeset/base/365094
Log:
aac: clean up empty lines in .c and .h files
Modified:
head/sys/dev/aac/aac.c
head/sys/dev/aac/aac_cam.c
head/sys/dev/aac/aac_debug.c
head/sys/dev/aac/aac_disk.c
head/sys/dev/aac/aacreg.h
Modified: head/sys/dev/aac/aac.c
==
--- head/sys/dev/aac/aac.c Tue Sep 1 21:31:50 2020(r365093)
+++ head/sys/dev/aac/aac.c Tue Sep 1 21:32:07 2020(r365094)
@@ -1029,7 +1029,6 @@ aac_command_thread(struct aac_softc *sc)
sc->aifflags = AAC_AIFFLAGS_RUNNING;
while ((sc->aifflags & AAC_AIFFLAGS_EXIT) == 0) {
-
retval = 0;
if ((sc->aifflags & AAC_AIFFLAGS_PENDING) == 0)
retval = msleep(sc->aifthread, >aac_io_lock, PRIBIO,
@@ -1533,7 +1532,6 @@ aac_free_commands(struct aac_softc *sc)
fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
while ((fm = TAILQ_FIRST(>aac_fibmap_tqh)) != NULL) {
-
TAILQ_REMOVE(>aac_fibmap_tqh, fm, fm_link);
/*
* We check against total_fibs to handle partially
Modified: head/sys/dev/aac/aac_cam.c
==
--- head/sys/dev/aac/aac_cam.c Tue Sep 1 21:31:50 2020(r365093)
+++ head/sys/dev/aac/aac_cam.c Tue Sep 1 21:32:07 2020(r365094)
@@ -144,7 +144,6 @@ aac_cam_rescan(struct aac_softc *sc, uint32_t channel,
}
}
-
static void
aac_cam_event(struct aac_softc *sc, struct aac_event *event, void *arg)
{
Modified: head/sys/dev/aac/aac_debug.c
==
--- head/sys/dev/aac/aac_debug.cTue Sep 1 21:31:50 2020
(r365093)
+++ head/sys/dev/aac/aac_debug.cTue Sep 1 21:32:07 2020
(r365094)
@@ -392,7 +392,7 @@ aac_print_aif(struct aac_softc *sc, struct aac_aif_com
default:
status = "unknown status"; break;
}
-
+
device_printf(sc->aac_dev, "JobProgress (%d) - %s (%d, %d)\n",
aif->seqNumber, status,
aif->data.PR[0].currentTick,
Modified: head/sys/dev/aac/aac_disk.c
==
--- head/sys/dev/aac/aac_disk.c Tue Sep 1 21:31:50 2020(r365093)
+++ head/sys/dev/aac/aac_disk.c Tue Sep 1 21:32:07 2020(r365094)
@@ -100,7 +100,7 @@ aac_disk_open(struct disk *dp)
fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
sc = (struct aac_disk *)dp->d_drv1;
-
+
if (sc == NULL) {
printf("aac_disk_open: No Softc\n");
return (ENXIO);
@@ -129,7 +129,7 @@ aac_disk_close(struct disk *dp)
fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
sc = (struct aac_disk *)dp->d_drv1;
-
+
if (sc == NULL)
return (ENXIO);
@@ -366,7 +366,7 @@ static int
aac_disk_attach(device_t dev)
{
struct aac_disk *sc;
-
+
sc = (struct aac_disk *)device_get_softc(dev);
fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
Modified: head/sys/dev/aac/aacreg.h
==
--- head/sys/dev/aac/aacreg.h Tue Sep 1 21:31:50 2020(r365093)
+++ head/sys/dev/aac/aacreg.h Tue Sep 1 21:32:07 2020(r365094)
@@ -1563,4 +1563,3 @@ enum {
AAC_DB_RESPONSE_READY |\
AAC_DB_PRINTF)
#define AAC_DB_INT_NEW_COMM0x08
-
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365092 - head/sys/dev/tws
Author: mjg
Date: Tue Sep 1 21:31:38 2020
New Revision: 365092
URL: https://svnweb.freebsd.org/changeset/base/365092
Log:
tws: clean up empty lines in .c and .h files
Modified:
head/sys/dev/tws/tws.c
head/sys/dev/tws/tws.h
head/sys/dev/tws/tws_cam.c
head/sys/dev/tws/tws_hdm.c
head/sys/dev/tws/tws_hdm.h
head/sys/dev/tws/tws_services.c
head/sys/dev/tws/tws_services.h
head/sys/dev/tws/tws_user.c
head/sys/dev/tws/tws_user.h
Modified: head/sys/dev/tws/tws.c
==
--- head/sys/dev/tws/tws.c Tue Sep 1 21:31:26 2020(r365091)
+++ head/sys/dev/tws/tws.c Tue Sep 1 21:31:38 2020(r365092)
@@ -49,8 +49,6 @@ int tws_queue_depth = TWS_MAX_REQS;
int tws_enable_msi = 0;
int tws_enable_msix = 0;
-
-
/* externs */
extern int tws_cam_attach(struct tws_softc *sc);
extern void tws_cam_detach(struct tws_softc *sc);
@@ -68,15 +66,12 @@ extern boolean tws_ctlr_reset(struct tws_softc *sc);
extern void tws_intr(void *arg);
extern int tws_use_32bit_sgls;
-
struct tws_request *tws_get_request(struct tws_softc *sc, u_int16_t type);
int tws_init_connect(struct tws_softc *sc, u_int16_t mc);
void tws_send_event(struct tws_softc *sc, u_int8_t event);
uint8_t tws_get_state(struct tws_softc *sc);
void tws_release_request(struct tws_request *req);
-
-
/* Function prototypes */
static d_open_t tws_open;
static d_close_ttws_close;
@@ -95,7 +90,6 @@ static int tws_setup_irq(struct tws_softc *sc);
int tws_setup_intr(struct tws_softc *sc, int irqs);
int tws_teardown_intr(struct tws_softc *sc);
-
/* Character device entry points */
static struct cdevsw tws_cdevsw = {
@@ -209,7 +203,6 @@ tws_attach(device_t dev)
tws_send_event(sc, TWS_INIT_START);
mtx_unlock(>gen_lock);
-
#if _BYTE_ORDER == _BIG_ENDIAN
TWS_TRACE(sc, "BIG endian", 0, 0);
#endif
@@ -233,7 +226,7 @@ tws_attach(device_t dev)
bar = pci_read_config(dev, TWS_PCI_BAR1, 4);
bar = bar & ~TWS_BIT2;
TWS_TRACE_DEBUG(sc, "bar1 ", bar, 0);
-
+
/* MFA base address is BAR2 register used for
* push mode. Firmware will evatualy move to
* pull mode during witch this needs to change
@@ -455,7 +448,6 @@ tws_setup_intr(struct tws_softc *sc, int irqs)
}
-
int
tws_teardown_intr(struct tws_softc *sc)
{
@@ -471,7 +463,6 @@ tws_teardown_intr(struct tws_softc *sc)
return(SUCCESS);
}
-
static int
tws_setup_irq(struct tws_softc *sc)
{
@@ -506,7 +497,6 @@ tws_setup_irq(struct tws_softc *sc)
return(FAILURE);
device_printf(sc->tws_dev, "Using MSI\n");
break;
-
}
return(SUCCESS);
@@ -727,7 +717,6 @@ tws_send_event(struct tws_softc *sc, u_int8_t event)
mtx_assert(>gen_lock, MA_OWNED);
TWS_TRACE_DEBUG(sc, "received event ", 0, event);
switch (event) {
-
case TWS_INIT_START:
sc->tws_state = TWS_INIT;
break;
@@ -826,7 +815,6 @@ tws_resume(device_t dev)
return (0);
}
-
struct tws_request *
tws_get_request(struct tws_softc *sc, u_int16_t type)
{
@@ -892,7 +880,6 @@ static driver_t tws_driver = {
tws_methods,
sizeof(struct tws_softc)
};
-
static devclass_t tws_devclass;
Modified: head/sys/dev/tws/tws.h
==
--- head/sys/dev/tws/tws.h Tue Sep 1 21:31:26 2020(r365091)
+++ head/sys/dev/tws/tws.h Tue Sep 1 21:31:38 2020(r365092)
@@ -60,14 +60,12 @@
#include
#include
-
#define TWS_PULL_MODE_ENABLE 1
MALLOC_DECLARE(M_TWS);
/* externs */
extern int tws_queue_depth;
-
#define TWS_DRIVER_VERSION_STRING "10.80.00.005"
#define TWS_MAX_NUM_UNITS 65
#define TWS_MAX_NUM_LUNS 32
@@ -142,7 +140,7 @@ enum tws_req_flags {
TWS_DIR_NONE = 0x8,
TWS_DATA_CCB = 0x10,
};
-
+
enum tws_intrs {
TWS_INTx,
TWS_MSI,
@@ -160,7 +158,6 @@ struct tws_ioctl_lock {
u_int32_t lock;
time_t timeout;
};
-
#define TWS_TRACE_FNAME_LEN 10
#define TWS_TRACE_FUNC_LEN 15
@@ -182,9 +179,7 @@ struct tws_circular_q {
u_int8_t overflow;
void *q;
};
-
-
struct tws_stats {
u_int64_t reqs_in;
u_int64_t reqs_out;
@@ -205,7 +200,6 @@ struct tws_init_connect_info {
u_int16_t fw_on_ctlr_build;
};
-
/* boolean types --- */
Modified: head/sys/dev/tws/tws_cam.c
==
--- head/sys/dev/tws/tws_cam.c Tue Sep 1 21:31:26 2020(r365091)
+++ head/sys/dev/tws/tws_cam.c Tue Sep 1 21:31:38 2020(r365092)
@@ -50,8 +50,6 @@ static void tws_action(struct cam_sim *sim, union ccb
static void tws_poll(struct cam_sim *sim);
static void tws_scsi_complete(struct tws_request *req);
-
-
void tws_unmap_request(struct tws_softc *sc, struct tws_request *req);
svn commit: r365091 - in head/sys/dev/virtio: . balloon block console network scsi
Author: mjg
Date: Tue Sep 1 21:31:26 2020
New Revision: 365091
URL: https://svnweb.freebsd.org/changeset/base/365091
Log:
virtio: clean up empty lines in .c and .h files
Modified:
head/sys/dev/virtio/balloon/virtio_balloon.c
head/sys/dev/virtio/block/virtio_blk.c
head/sys/dev/virtio/console/virtio_console.c
head/sys/dev/virtio/network/if_vtnet.c
head/sys/dev/virtio/scsi/virtio_scsi.c
head/sys/dev/virtio/virtio.c
Modified: head/sys/dev/virtio/balloon/virtio_balloon.c
==
--- head/sys/dev/virtio/balloon/virtio_balloon.cTue Sep 1 21:30:22
2020(r365090)
+++ head/sys/dev/virtio/balloon/virtio_balloon.cTue Sep 1 21:31:26
2020(r365091)
@@ -80,7 +80,6 @@ struct vtballoon_softc {
static struct virtio_feature_desc vtballoon_feature_desc[] = {
{ VIRTIO_BALLOON_F_MUST_TELL_HOST, "MustTellHost" },
{ VIRTIO_BALLOON_F_STATS_VQ,"StatsVq" },
-
{ 0, NULL }
};
Modified: head/sys/dev/virtio/block/virtio_blk.c
==
--- head/sys/dev/virtio/block/virtio_blk.c Tue Sep 1 21:30:22 2020
(r365090)
+++ head/sys/dev/virtio/block/virtio_blk.c Tue Sep 1 21:31:26 2020
(r365091)
@@ -114,7 +114,6 @@ static struct virtio_feature_desc vtblk_feature_desc[]
{ VIRTIO_BLK_F_TOPOLOGY,"Topology" },
{ VIRTIO_BLK_F_CONFIG_WCE, "ConfigWCE" },
{ VIRTIO_BLK_F_DISCARD, "Discard" },
-
{ 0, NULL }
};
Modified: head/sys/dev/virtio/console/virtio_console.c
==
--- head/sys/dev/virtio/console/virtio_console.cTue Sep 1 21:30:22
2020(r365090)
+++ head/sys/dev/virtio/console/virtio_console.cTue Sep 1 21:31:26
2020(r365091)
@@ -146,7 +146,6 @@ static struct virtio_feature_desc vtcon_feature_desc[]
{ VIRTIO_CONSOLE_F_SIZE,"ConsoleSize" },
{ VIRTIO_CONSOLE_F_MULTIPORT, "MultiplePorts" },
{ VIRTIO_CONSOLE_F_EMERG_WRITE, "EmergencyWrite" },
-
{ 0, NULL }
};
@@ -511,7 +510,6 @@ vtcon_alloc_virtqueues(struct vtcon_softc *sc)
return (ENOMEM);
for (i = 0, idx = 0, portidx = 0; i < nvqs / 2; i++, idx += 2) {
-
if (i == 1) {
/* The control virtqueues are after the first port. */
VQ_ALLOC_INFO_INIT([idx], 0,
Modified: head/sys/dev/virtio/network/if_vtnet.c
==
--- head/sys/dev/virtio/network/if_vtnet.c Tue Sep 1 21:30:22 2020
(r365090)
+++ head/sys/dev/virtio/network/if_vtnet.c Tue Sep 1 21:31:26 2020
(r365091)
@@ -287,7 +287,6 @@ static struct virtio_feature_desc vtnet_feature_desc[]
{ VIRTIO_NET_F_GUEST_ANNOUNCE, "GuestAnnounce" },
{ VIRTIO_NET_F_MQ, "Multiqueue"},
{ VIRTIO_NET_F_CTRL_MAC_ADDR, "SetMacAddress" },
-
{ 0, NULL }
};
Modified: head/sys/dev/virtio/scsi/virtio_scsi.c
==
--- head/sys/dev/virtio/scsi/virtio_scsi.c Tue Sep 1 21:30:22 2020
(r365090)
+++ head/sys/dev/virtio/scsi/virtio_scsi.c Tue Sep 1 21:31:26 2020
(r365091)
@@ -206,7 +206,6 @@ TUNABLE_INT("hw.vtscsi.bus_reset_disable", _bus
static struct virtio_feature_desc vtscsi_feature_desc[] = {
{ VIRTIO_SCSI_F_INOUT, "InOut" },
{ VIRTIO_SCSI_F_HOTPLUG,"Hotplug" },
-
{ 0, NULL }
};
Modified: head/sys/dev/virtio/virtio.c
==
--- head/sys/dev/virtio/virtio.cTue Sep 1 21:30:22 2020
(r365090)
+++ head/sys/dev/virtio/virtio.cTue Sep 1 21:31:26 2020
(r365091)
@@ -69,7 +69,6 @@ static struct virtio_ident {
{ VIRTIO_ID_INPUT, "Input" },
{ VIRTIO_ID_VSOCK, "VSOCK Transport" },
{ VIRTIO_ID_CRYPTO, "Crypto"},
-
{ 0, NULL }
};
@@ -80,7 +79,6 @@ static struct virtio_feature_desc virtio_common_featur
{ VIRTIO_RING_F_EVENT_IDX, "EventIdx" },
{ VIRTIO_F_BAD_FEATURE, "BadFeature"},
{ VIRTIO_F_VERSION_1, "Version1" },
-
{ 0, NULL }
};
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r365054 - in head/sys: conf dev/sdhci
Sep 1, 2020 11:17:35 Marcin Wojtas :
> Author: mw
> Date: Tue Sep 1 16:17:21 2020
> New Revision: 365054
> URL: https://svnweb.freebsd.org/changeset/base/365054
>
> Log:
> Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs
>
> Implement support for an eSDHC controller found in NXP QorIQ Layerscape SoCs.
>
> This driver has been tested with NXP LS1046A and LX2160A (Honeycomb board),
> which is incompatible with the existing sdhci_fsl driver (aiming at older
> chips from this family). As such, it is not intended as replacement for
> the old driver, but rather serves as an improved alternative for SoCs that
> support it.
> It comes with support for both PIO and Single DMA modes and samples the
> clock from the extres clk API.
How is it incompatible?
>
> Submitted by: Artur Rojek
> Reviewed by: manu, mmel, kibab
> Obtained from: Semihalf
> Sponsored by: Alstom Group
> Differential Revision: https://reviews.freebsd.org/D26153
>
> Added:
> head/sys/dev/sdhci/sdhci_fsl_fdt.c  (contents, props changed)
The name choice here is odd, given there is already fsl_sdhci.c
> Modified:
> head/sys/conf/files
>
> Modified: head/sys/conf/files
> ==
> --- head/sys/conf/files Tue Sep 1 16:13:09 2020 (r365053)
> +++ head/sys/conf/files Tue Sep 1 16:17:21 2020 (r365054)
> @@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c  optional scc
> dev/sdhci/sdhci.c   optional sdhci
> dev/sdhci/sdhci_fdt.c   optional sdhci fdt
> dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio
> +dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio
> dev/sdhci/sdhci_if.m  optional sdhci
> dev/sdhci/sdhci_acpi.c  optional sdhci acpi
> dev/sdhci/sdhci_pci.c   optional sdhci pci
>
> Added: head/sys/dev/sdhci/sdhci_fsl_fdt.c
> ==
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/sys/dev/sdhci/sdhci_fsl_fdt.c Tue Sep 1 16:17:21 2020 (r365054)
> @@ -0,0 +1,680 @@
> +/*-
> + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
> + *
> + * Copyright (c) 2020 Alstom Group.
> + * Copyright (c) 2020 Semihalf.
> + *
> + * 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.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 THE AUTHOR OR 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.
> + */
> +
> +/* eSDHC controller driver for NXP QorIQ Layerscape SoCs. */
> +
> +#include
> +__FBSDID("$FreeBSD$");
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +#include
> +#include
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +#include "mmcbr_if.h"
> +#include "sdhci_if.h"
> +
> +#define RD4 (sc->read)
> +#define WR4 (sc->write)
> +
> +#define SDHCI_FSL_PRES_STATE   0x24
> +#define SDHCI_FSL_PRES_SDSTB   (1 << 3)
> +#define SDHCI_FSL_PRES_COMPAT_MASK 0x000f0f07
> +
> +#define SDHCI_FSL_PROT_CTRL  0x28
> +#define SDHCI_FSL_PROT_CTRL_WIDTH_1BIT (0 << 1)
> +#define SDHCI_FSL_PROT_CTRL_WIDTH_4BIT (1 << 1)
> +#define SDHCI_FSL_PROT_CTRL_WIDTH_8BIT (2 << 1)
> +#define SDHCI_FSL_PROT_CTRL_WIDTH_MASK (3 << 1)
> +#define SDHCI_FSL_PROT_CTRL_BYTE_SWAP (0 << 4)
> +#define SDHCI_FSL_PROT_CTRL_BYTE_NATIVE (2 << 4)
> +#define SDHCI_FSL_PROT_CTRL_BYTE_MASK (3 << 4)
> +#define SDHCI_FSL_PROT_CTRL_DMA_MASK (3 << 8)
> +
> +#define SDHCI_FSL_SYS_CTRL   0x2c
> +#define SDHCI_FSL_CLK_IPGEN  (1 << 0)
> +#define SDHCI_FSL_CLK_SDCLKEN  (1 << 3)
> +#define SDHCI_FSL_CLK_DIVIDER_MASK 0x00f0
> +#define SDHCI_FSL_CLK_DIVIDER_SHIFT 4
> +#define SDHCI_FSL_CLK_PRESCALE_MASK 0xff00
> +#define SDHCI_FSL_CLK_PRESCALE_SHIFT 8
> +
> +#define SDHCI_FSL_WTMK_LVL   0x44
> +#define SDHCI_FSL_WTMK_RD_512B   (0 << 0)
>
svn commit: r365088 - in head/sys/dev/syscons: . daemon logo rain warp
Author: mjg
Date: Tue Sep 1 21:29:44 2020
New Revision: 365088
URL: https://svnweb.freebsd.org/changeset/base/365088
Log:
syscons: clean up empty lines in .c and .h files
Modified:
head/sys/dev/syscons/daemon/daemon_saver.c
head/sys/dev/syscons/logo/logo_saver.c
head/sys/dev/syscons/rain/rain_saver.c
head/sys/dev/syscons/scgfbrndr.c
head/sys/dev/syscons/schistory.c
head/sys/dev/syscons/scmouse.c
head/sys/dev/syscons/scterm-sc.c
head/sys/dev/syscons/scvesactl.c
head/sys/dev/syscons/scvgarndr.c
head/sys/dev/syscons/scvidctl.c
head/sys/dev/syscons/syscons.c
head/sys/dev/syscons/sysmouse.c
head/sys/dev/syscons/warp/warp_saver.c
Modified: head/sys/dev/syscons/daemon/daemon_saver.c
==
--- head/sys/dev/syscons/daemon/daemon_saver.c Tue Sep 1 21:29:23 2020
(r365087)
+++ head/sys/dev/syscons/daemon/daemon_saver.c Tue Sep 1 21:29:44 2020
(r365088)
@@ -359,7 +359,7 @@ daemon_init(video_adapter_t *adp)
for (;;) {
hostlen = strlen(prison0.pr_hostname);
mtx_unlock(_mtx);
-
+
messagelen = hostlen + 3 + strlen(ostype) + 1 +
strlen(osrelease);
message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
Modified: head/sys/dev/syscons/logo/logo_saver.c
==
--- head/sys/dev/syscons/logo/logo_saver.c Tue Sep 1 21:29:23 2020
(r365087)
+++ head/sys/dev/syscons/logo/logo_saver.c Tue Sep 1 21:29:44 2020
(r365088)
@@ -65,11 +65,11 @@ logo_blit(video_adapter_t *adp, int x, int y)
{
int d, l, o, p;
int last_origin = -1;
-
+
for (o = 0, p = y * bpsl + x; p > banksize; p -= banksize)
o += banksize;
SET_ORIGIN(adp, o);
-
+
for (d = 0; d < logo_img_size; d += logo_w) {
if (p + logo_w < banksize) {
bcopy(logo_img + d, vid + p, logo_w);
@@ -94,7 +94,7 @@ logo_update(video_adapter_t *adp)
{
static int xpos = 0, ypos = 0;
static int xinc = 1, yinc = 1;
-
+
/* Turn when you hit the edge */
if ((xpos + logo_w + xinc > scrw) || (xpos + xinc < 0))
xinc = -xinc;
@@ -102,7 +102,7 @@ logo_update(video_adapter_t *adp)
yinc = -yinc;
xpos += xinc;
ypos += yinc;
-
+
/* XXX Relies on margin around logo to erase trail */
logo_blit(adp, xpos, ypos);
}
@@ -111,7 +111,7 @@ static int
logo_saver(video_adapter_t *adp, int blank)
{
int pl;
-
+
if (blank) {
/* switch to graphics mode */
if (blanked <= 0) {
@@ -137,7 +137,7 @@ static int
logo_init(video_adapter_t *adp)
{
video_info_t info;
-
+
if (!vidd_get_info(adp, M_VESA_CG800x600, )) {
scrmode = M_VESA_CG800x600;
} else if (!vidd_get_info(adp, M_VGA_CG320, )) {
@@ -148,10 +148,10 @@ logo_init(video_adapter_t *adp)
SAVER_NAME);
return (ENODEV);
}
-
+
scrw = info.vi_width;
scrh = info.vi_height;
-
+
return (0);
}
Modified: head/sys/dev/syscons/rain/rain_saver.c
==
--- head/sys/dev/syscons/rain/rain_saver.c Tue Sep 1 21:29:23 2020
(r365087)
+++ head/sys/dev/syscons/rain/rain_saver.c Tue Sep 1 21:29:44 2020
(r365088)
@@ -142,7 +142,7 @@ rain_init(video_adapter_t *adp)
{
video_info_t info;
int i;
-
+
if (!vidd_get_info(adp, M_VGA_CG320, )) {
scrmode = M_VGA_CG320;
} else {
@@ -151,14 +151,14 @@ rain_init(video_adapter_t *adp)
SAVER_NAME);
return (ENODEV);
}
-
+
scrw = info.vi_width;
scrh = info.vi_height;
/* intialize the palette */
for (i = 1; i < MAX; i++)
rain_pal[BLUE(i)] = rain_pal[BLUE(i - 1)] + INCREMENT;
-
+
return (0);
}
Modified: head/sys/dev/syscons/scgfbrndr.c
==
--- head/sys/dev/syscons/scgfbrndr.cTue Sep 1 21:29:23 2020
(r365087)
+++ head/sys/dev/syscons/scgfbrndr.cTue Sep 1 21:29:44 2020
(r365088)
@@ -147,7 +147,6 @@ gfb_draw(scr_stat *scp, int from, int count, int flip)
and the number of characters to be displayed...
*/
if (from + count > scp->xsize*scp->ysize) {
-
/*
Calculate the number of characters past the end of the
visible screen...
@@ -177,7 +176,6 @@ gfb_draw(scr_stat *scp, int from, int count, int flip)
all-at-once...
*/
else {
-
/*
Determine
svn commit: r365089 - in head/sys/dev/vmware: pvscsi vmci vmxnet3
Author: mjg
Date: Tue Sep 1 21:30:01 2020
New Revision: 365089
URL: https://svnweb.freebsd.org/changeset/base/365089
Log:
vmware: clean up empty lines in .c and .h files
Modified:
head/sys/dev/vmware/pvscsi/pvscsi.c
head/sys/dev/vmware/vmci/vmci_defs.h
head/sys/dev/vmware/vmci/vmci_doorbell.c
head/sys/dev/vmware/vmci/vmci_driver.c
head/sys/dev/vmware/vmci/vmci_event.c
head/sys/dev/vmware/vmci/vmci_hashtable.c
head/sys/dev/vmware/vmci/vmci_kernel_if.c
head/sys/dev/vmware/vmci/vmci_queue_pair.c
head/sys/dev/vmware/vmxnet3/if_vmx.c
Modified: head/sys/dev/vmware/pvscsi/pvscsi.c
==
--- head/sys/dev/vmware/pvscsi/pvscsi.c Tue Sep 1 21:29:44 2020
(r365088)
+++ head/sys/dev/vmware/pvscsi/pvscsi.c Tue Sep 1 21:30:01 2020
(r365089)
@@ -127,7 +127,6 @@ static int pvscsi_probe(device_t dev);
static int pvscsi_shutdown(device_t dev);
static int pvscsi_get_tunable(struct pvscsi_softc *sc, char *name, int value);
-
#ifdef PVSCSI_DEBUG_LOGGING
static int pvscsi_log_level = 0;
static SYSCTL_NODE(_hw, OID_AUTO, pvscsi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
@@ -154,11 +153,9 @@ TUNABLE_INT("hw.pvscsi.use_req_call_threshold",
static int pvscsi_max_queue_depth = 0;
TUNABLE_INT("hw.pvscsi.max_queue_depth", _max_queue_depth);
-
struct pvscsi_sg_list {
struct pvscsi_sg_element sge[PVSCSI_MAX_SG_ENTRIES_PER_SEGMENT];
};
-
#definePVSCSI_ABORT_TIMEOUT2
#definePVSCSI_RESET_TIMEOUT10
Modified: head/sys/dev/vmware/vmci/vmci_defs.h
==
--- head/sys/dev/vmware/vmci/vmci_defs.hTue Sep 1 21:29:44 2020
(r365088)
+++ head/sys/dev/vmware/vmci/vmci_defs.hTue Sep 1 21:30:01 2020
(r365089)
@@ -386,7 +386,6 @@ struct vmci_queue_header {
volatile uint64_t consumer_head; /* Offset in peer queue. */
};
-
/*
* If one client of a QueuePair is a 32bit entity, we restrict the QueuePair
* size to be less than 4GB, and use 32bit atomic operations on the head and
Modified: head/sys/dev/vmware/vmci/vmci_doorbell.c
==
--- head/sys/dev/vmware/vmci/vmci_doorbell.cTue Sep 1 21:29:44 2020
(r365088)
+++ head/sys/dev/vmware/vmci/vmci_doorbell.cTue Sep 1 21:30:01 2020
(r365089)
@@ -621,7 +621,6 @@ vmci_doorbell_destroy(struct vmci_handle handle)
result = vmci_doorbell_unlink(handle, entry->is_doorbell);
if (VMCI_SUCCESS != result) {
-
/*
* The only reason this should fail would be an inconsistency
* between guest and hypervisor state, where the guest believes
Modified: head/sys/dev/vmware/vmci/vmci_driver.c
==
--- head/sys/dev/vmware/vmci/vmci_driver.c Tue Sep 1 21:29:44 2020
(r365088)
+++ head/sys/dev/vmware/vmci/vmci_driver.c Tue Sep 1 21:30:01 2020
(r365089)
@@ -281,10 +281,8 @@ vmci_read_datagrams_from_port(vmci_io_handle io_handle
*/
if (dg_in_size > remaining_bytes) {
-
if (remaining_bytes !=
current_dg_in_buffer_size) {
-
/*
* We move the partial datagram to the
* front and read the reminder of the
Modified: head/sys/dev/vmware/vmci/vmci_event.c
==
--- head/sys/dev/vmware/vmci/vmci_event.c Tue Sep 1 21:29:44 2020
(r365088)
+++ head/sys/dev/vmware/vmci/vmci_event.c Tue Sep 1 21:30:01 2020
(r365089)
@@ -104,7 +104,6 @@ vmci_event_exit(void)
for (e = 0; e < VMCI_EVENT_MAX; e++) {
vmci_list_scan_safe(iter, _array[e],
subscriber_list_item, iter_2) {
-
/*
* We should never get here because all events should
* have been unregistered before we try to unload the
Modified: head/sys/dev/vmware/vmci/vmci_hashtable.c
==
--- head/sys/dev/vmware/vmci/vmci_hashtable.c Tue Sep 1 21:29:44 2020
(r365088)
+++ head/sys/dev/vmware/vmci/vmci_hashtable.c Tue Sep 1 21:30:01 2020
(r365089)
@@ -368,7 +368,6 @@ vmci_hashtable_release_entry_locked(struct vmci_hashta
entry->ref_count--;
/* Check if this is last reference and report if so. */
if (entry->ref_count == 0) {
-
/*
* Remove entry from hash table if not already removed. This
* could have happened already because VMCIHashTable_RemoveEntry
svn commit: r365090 - in head/sys/dev: iscsi iscsi_initiator
Author: mjg
Date: Tue Sep 1 21:30:22 2020
New Revision: 365090
URL: https://svnweb.freebsd.org/changeset/base/365090
Log:
iscsi: clean up empty lines in .c and .h files
Modified:
head/sys/dev/iscsi/icl_soft.c
head/sys/dev/iscsi/icl_soft_proxy.c
head/sys/dev/iscsi/iscsi.c
head/sys/dev/iscsi_initiator/isc_cam.c
head/sys/dev/iscsi_initiator/iscsi.c
head/sys/dev/iscsi_initiator/iscsi_subr.c
Modified: head/sys/dev/iscsi/icl_soft.c
==
--- head/sys/dev/iscsi/icl_soft.c Tue Sep 1 21:30:01 2020
(r365089)
+++ head/sys/dev/iscsi/icl_soft.c Tue Sep 1 21:30:22 2020
(r365090)
@@ -954,7 +954,6 @@ icl_conn_send_pdus(struct icl_conn *ic, struct icl_pdu
request = STAILQ_FIRST(queue);
size = icl_pdu_size(request);
if (available < size) {
-
/*
* Set the low watermark, to be checked by
* sowriteable() in icl_soupcall_send()
Modified: head/sys/dev/iscsi/icl_soft_proxy.c
==
--- head/sys/dev/iscsi/icl_soft_proxy.c Tue Sep 1 21:30:01 2020
(r365089)
+++ head/sys/dev/iscsi/icl_soft_proxy.c Tue Sep 1 21:30:22 2020
(r365090)
@@ -192,7 +192,7 @@ icl_listen_free(struct icl_listen *il)
pause("icl_unlisten", 1 * hz);
sx_xlock(>il_lock);
}
-
+
TAILQ_REMOVE(>il_sockets, ils, ils_next);
soclose(ils->ils_socket);
free(ils, M_ICL_PROXY);
@@ -325,7 +325,6 @@ icl_listen_add(struct icl_listen *il, bool rdma, int d
ICL_DEBUG("RDMA not supported");
return (EOPNOTSUPP);
}
-
return (icl_listen_add_tcp(il, domain, socktype, protocol, sa,
portal_id));
Modified: head/sys/dev/iscsi/iscsi.c
==
--- head/sys/dev/iscsi/iscsi.c Tue Sep 1 21:30:01 2020(r365089)
+++ head/sys/dev/iscsi/iscsi.c Tue Sep 1 21:30:22 2020(r365090)
@@ -398,14 +398,14 @@ iscsi_maintenance_thread_reconnect(struct iscsi_sessio
}
cv_signal(>is_login_cv);
#endif
-
+
if (fail_on_disconnection) {
ISCSI_SESSION_DEBUG(is, "connection failed, destroying
devices");
iscsi_session_cleanup(is, true);
} else {
iscsi_session_cleanup(is, false);
}
-
+
KASSERT(TAILQ_EMPTY(>is_outstanding),
("destroying session with active tasks"));
KASSERT(STAILQ_EMPTY(>is_postponed),
@@ -1037,7 +1037,7 @@ iscsi_pdu_handle_data_in(struct icl_pdu *response)
union ccb *ccb;
struct ccb_scsiio *csio;
size_t data_segment_len, received, oreceived;
-
+
is = PDU_SESSION(response);
bhsdi = (struct iscsi_bhs_data_in *)response->ip_bhs;
io = iscsi_outstanding_find(is, bhsdi->bhsdi_initiator_task_tag);
Modified: head/sys/dev/iscsi_initiator/isc_cam.c
==
--- head/sys/dev/iscsi_initiator/isc_cam.c Tue Sep 1 21:30:01 2020
(r365089)
+++ head/sys/dev/iscsi_initiator/isc_cam.c Tue Sep 1 21:30:22 2020
(r365090)
@@ -211,7 +211,7 @@ ic_action(struct cam_sim *sim, union ccb *ccb)
return;
break;
}
-
+
case XPT_CALC_GEOMETRY:
{
structccb_calc_geometry *ccg;
@@ -330,7 +330,6 @@ ic_init(isc_session_t *sp)
if(xpt_bus_register(sim,
NULL,
0/*bus_number*/) != CAM_SUCCESS) {
-
cam_sim_free(sim, /*free_devq*/TRUE);
mtx_destroy(>cam_mtx);
return ENXIO;
Modified: head/sys/dev/iscsi_initiator/iscsi.c
==
--- head/sys/dev/iscsi_initiator/iscsi.cTue Sep 1 21:30:01 2020
(r365089)
+++ head/sys/dev/iscsi_initiator/iscsi.cTue Sep 1 21:30:22 2020
(r365090)
@@ -370,7 +370,6 @@ iscsi_read(struct cdev *dev, struct uio *uio, int iofl
sprintf(buf, "/ socket -/\nso_count=%d so_state=%x\n",
so->so_count, so->so_state);
uiomove(buf, strlen(buf), uio);
-
}
#endif
return 0;
@@ -749,7 +748,7 @@ iscsi_start(void)
iscsi_driver_version,
0,
"iscsi driver version");
-
+
SYSCTL_ADD_STRING(>clist,
SYSCTL_CHILDREN(isc->oid),
OID_AUTO,
Modified: head/sys/dev/iscsi_initiator/iscsi_subr.c
==
--- head/sys/dev/iscsi_initiator/iscsi_subr.c Tue Sep 1 21:30:01 2020
(r365089)
+++
svn commit: r365086 - in head/sys/dev/sfxge: . common
Author: mjg
Date: Tue Sep 1 21:29:01 2020
New Revision: 365086
URL: https://svnweb.freebsd.org/changeset/base/365086
Log:
sfxge: clean up empty lines in .c and .h files
Modified:
head/sys/dev/sfxge/common/ef10_ev.c
head/sys/dev/sfxge/common/ef10_filter.c
head/sys/dev/sfxge/common/ef10_image.c
head/sys/dev/sfxge/common/ef10_impl.h
head/sys/dev/sfxge/common/ef10_intr.c
head/sys/dev/sfxge/common/ef10_mac.c
head/sys/dev/sfxge/common/ef10_mcdi.c
head/sys/dev/sfxge/common/ef10_nic.c
head/sys/dev/sfxge/common/ef10_nvram.c
head/sys/dev/sfxge/common/ef10_phy.c
head/sys/dev/sfxge/common/ef10_rx.c
head/sys/dev/sfxge/common/ef10_tlv_layout.h
head/sys/dev/sfxge/common/ef10_tx.c
head/sys/dev/sfxge/common/ef10_vpd.c
head/sys/dev/sfxge/common/efsys.h
head/sys/dev/sfxge/common/efx.h
head/sys/dev/sfxge/common/efx_bootcfg.c
head/sys/dev/sfxge/common/efx_ev.c
head/sys/dev/sfxge/common/efx_filter.c
head/sys/dev/sfxge/common/efx_hash.c
head/sys/dev/sfxge/common/efx_impl.h
head/sys/dev/sfxge/common/efx_intr.c
head/sys/dev/sfxge/common/efx_lic.c
head/sys/dev/sfxge/common/efx_mac.c
head/sys/dev/sfxge/common/efx_mcdi.c
head/sys/dev/sfxge/common/efx_mcdi.h
head/sys/dev/sfxge/common/efx_mon.c
head/sys/dev/sfxge/common/efx_nic.c
head/sys/dev/sfxge/common/efx_nvram.c
head/sys/dev/sfxge/common/efx_phy.c
head/sys/dev/sfxge/common/efx_phy_ids.h
head/sys/dev/sfxge/common/efx_regs.h
head/sys/dev/sfxge/common/efx_regs_ef10.h
head/sys/dev/sfxge/common/efx_regs_mcdi.h
head/sys/dev/sfxge/common/efx_regs_mcdi_aoe.h
head/sys/dev/sfxge/common/efx_regs_pci.h
head/sys/dev/sfxge/common/efx_rx.c
head/sys/dev/sfxge/common/efx_sram.c
head/sys/dev/sfxge/common/efx_tunnel.c
head/sys/dev/sfxge/common/efx_tx.c
head/sys/dev/sfxge/common/efx_types.h
head/sys/dev/sfxge/common/hunt_impl.h
head/sys/dev/sfxge/common/hunt_nic.c
head/sys/dev/sfxge/common/mcdi_mon.c
head/sys/dev/sfxge/common/mcdi_mon.h
head/sys/dev/sfxge/common/medford2_impl.h
head/sys/dev/sfxge/common/medford2_nic.c
head/sys/dev/sfxge/common/medford_impl.h
head/sys/dev/sfxge/common/medford_nic.c
head/sys/dev/sfxge/common/siena_flash.h
head/sys/dev/sfxge/common/siena_impl.h
head/sys/dev/sfxge/common/siena_mcdi.c
head/sys/dev/sfxge/common/siena_nic.c
head/sys/dev/sfxge/common/siena_nvram.c
head/sys/dev/sfxge/sfxge.c
head/sys/dev/sfxge/sfxge.h
head/sys/dev/sfxge/sfxge_ev.c
head/sys/dev/sfxge/sfxge_intr.c
head/sys/dev/sfxge/sfxge_mcdi.c
head/sys/dev/sfxge/sfxge_nvram.c
head/sys/dev/sfxge/sfxge_rx.c
head/sys/dev/sfxge/sfxge_tx.c
head/sys/dev/sfxge/sfxge_tx.h
Modified: head/sys/dev/sfxge/common/ef10_ev.c
==
--- head/sys/dev/sfxge/common/ef10_ev.c Tue Sep 1 21:27:34 2020
(r365085)
+++ head/sys/dev/sfxge/common/ef10_ev.c Tue Sep 1 21:29:01 2020
(r365086)
@@ -91,7 +91,6 @@ ef10_ev_mcdi(
__inconst efx_ev_callbacks_t *eecp,
__in_optvoid *arg);
-
static __checkReturn efx_rc_t
efx_mcdi_set_evq_tmr(
__inefx_nic_t *enp,
@@ -273,7 +272,6 @@ fail1:
return (rc);
}
-
static __checkReturn efx_rc_t
efx_mcdi_init_evq_v2(
__inefx_nic_t *enp,
@@ -440,8 +438,6 @@ fail1:
return (rc);
}
-
-
__checkReturn efx_rc_t
ef10_ev_init(
__inefx_nic_t *enp)
@@ -753,7 +749,6 @@ fail1:
return (rc);
}
-
#if EFSYS_OPT_QSTATS
void
Modified: head/sys/dev/sfxge/common/ef10_filter.c
==
--- head/sys/dev/sfxge/common/ef10_filter.c Tue Sep 1 21:27:34 2020
(r365085)
+++ head/sys/dev/sfxge/common/ef10_filter.c Tue Sep 1 21:29:01 2020
(r365086)
@@ -577,7 +577,6 @@ ef10_filter_restore(
enp->en_family == EFX_FAMILY_MEDFORD2);
for (tbl_id = 0; tbl_id < EFX_EF10_FILTER_TBL_ROWS; tbl_id++) {
-
EFSYS_LOCK(enp->en_eslp, state);
spec = ef10_filter_entry_spec(eftp, tbl_id);
@@ -729,7 +728,6 @@ found:
/* This is a filter we are refreshing */
ef10_filter_set_entry_not_auto_old(eftp, ins_index);
goto out_unlock;
-
}
replacing = B_TRUE;
} else {
@@ -835,7 +833,6 @@ fail1:
return (rc);
}
-
static __checkReturn efx_rc_t
ef10_filter_delete_internal(
__inefx_nic_t *enp,
@@ -1288,7 +1285,6 @@ ef10_filter_insert_multicast_list(
/* Only stop upon failure if told to rollback */
goto rollback;
}
-
}
if (brdcst == B_TRUE) {
@@ -1493,7 +1489,6 @@ ef10_filter_remove_old(
}
}
-
static __checkReturn efx_rc_t
ef10_filter_get_workarounds(
__in
svn commit: r365087 - head/sys/dev/twa
Author: mjg
Date: Tue Sep 1 21:29:23 2020
New Revision: 365087
URL: https://svnweb.freebsd.org/changeset/base/365087
Log:
twa: clean up empty lines in .c and .h files
Modified:
head/sys/dev/twa/tw_cl.h
head/sys/dev/twa/tw_cl_externs.h
head/sys/dev/twa/tw_cl_fwif.h
head/sys/dev/twa/tw_cl_init.c
head/sys/dev/twa/tw_cl_intr.c
head/sys/dev/twa/tw_cl_io.c
head/sys/dev/twa/tw_cl_ioctl.h
head/sys/dev/twa/tw_cl_misc.c
head/sys/dev/twa/tw_cl_share.h
head/sys/dev/twa/tw_osl.h
head/sys/dev/twa/tw_osl_cam.c
head/sys/dev/twa/tw_osl_externs.h
head/sys/dev/twa/tw_osl_freebsd.c
head/sys/dev/twa/tw_osl_includes.h
head/sys/dev/twa/tw_osl_inline.h
head/sys/dev/twa/tw_osl_ioctl.h
head/sys/dev/twa/tw_osl_share.h
head/sys/dev/twa/tw_osl_types.h
Modified: head/sys/dev/twa/tw_cl.h
==
--- head/sys/dev/twa/tw_cl.hTue Sep 1 21:29:01 2020(r365086)
+++ head/sys/dev/twa/tw_cl.hTue Sep 1 21:29:23 2020(r365087)
@@ -36,18 +36,14 @@
* Modifications by: Adam Radford
*/
-
-
#ifndef TW_CL_H
#define TW_CL_H
-
/*
* Common Layer internal macros, structures and functions.
*/
-
#define TW_CLI_SECTOR_SIZE 0x200
#define TW_CLI_REQUEST_TIMEOUT_PERIOD 60 /* seconds */
#define TW_CLI_RESET_TIMEOUT_PERIOD60 /* seconds */
@@ -76,7 +72,6 @@
#define TW_CLI_PCI_CONFIG_STATUS_OFFSET0x6 /* status register
offset */
#endif /* TW_OSL_PCI_CONFIG_ACCESSIBLE */
-
#ifdef TW_OSL_DEBUG
struct tw_cli_q_stats {
TW_UINT32 cur_len;/* current # of entries in q */
@@ -84,7 +79,6 @@ struct tw_cli_q_stats {
};
#endif /* TW_OSL_DEBUG */
-
/* Queues of CL internal request context packets. */
#define TW_CLI_FREE_Q 0 /* free q */
#define TW_CLI_BUSY_Q 1 /* q of reqs submitted to fw */
@@ -93,7 +87,6 @@ struct tw_cli_q_stats {
#define TW_CLI_RESET_Q 4 /* q of reqs reset by timeout */
#define TW_CLI_Q_COUNT 5 /* total number of queues */
-
/* CL's internal request context. */
struct tw_cli_req_context {
struct tw_cl_req_handle *req_handle;/* handle to track requests between
@@ -119,7 +112,6 @@ struct tw_cli_req_context {
struct tw_cl_link link; /* to link this request in a list */
};
-
/* CL's internal controller context. */
struct tw_cli_ctlr_context {
struct tw_cl_ctlr_handle *ctlr_handle; /* handle to track ctlr between
@@ -209,8 +201,6 @@ struct tw_cli_ctlr_context {
#endif /* TW_OSL_DEBUG */
};
-
-
/*
* Queue primitives
*/
@@ -222,7 +212,6 @@ struct tw_cli_ctlr_context {
(ctlr)->q_stats[q_type].max_len = 0;\
} while (0)
-
#define TW_CLI_Q_INSERT(ctlr, q_type) do {\
struct tw_cli_q_stats *q_stats = &((ctlr)->q_stats[q_type]);\
\
@@ -230,7 +219,6 @@ struct tw_cli_ctlr_context {
q_stats->max_len = q_stats->cur_len;\
} while (0)
-
#define TW_CLI_Q_REMOVE(ctlr, q_type) \
(ctlr)->q_stats[q_type].cur_len--
@@ -242,7 +230,6 @@ struct tw_cli_ctlr_context {
#endif /* TW_OSL_DEBUG */
-
/* Initialize a queue of requests. */
static __inline TW_VOID
tw_cli_req_q_init(struct tw_cli_ctlr_context *ctlr, TW_UINT8 q_type)
@@ -251,8 +238,6 @@ tw_cli_req_q_init(struct tw_cli_ctlr_context *ctlr, TW
TW_CLI_Q_INIT(ctlr, q_type);
}
-
-
/* Insert the given request at the head of the given queue (q_type). */
static __inline TW_VOID
tw_cli_req_q_insert_head(struct tw_cli_req_context *req, TW_UINT8 q_type)
@@ -265,8 +250,6 @@ tw_cli_req_q_insert_head(struct tw_cli_req_context *re
tw_osl_free_lock(ctlr->ctlr_handle, ctlr->gen_lock);
}
-
-
/* Insert the given request at the tail of the given queue (q_type). */
static __inline TW_VOID
tw_cli_req_q_insert_tail(struct tw_cli_req_context *req, TW_UINT8 q_type)
@@ -279,8 +262,6 @@ tw_cli_req_q_insert_tail(struct tw_cli_req_context *re
tw_osl_free_lock(ctlr->ctlr_handle, ctlr->gen_lock);
}
-
-
/* Remove and return the request at the head of the given queue (q_type). */
static __inline struct tw_cli_req_context *
tw_cli_req_q_remove_head(struct tw_cli_ctlr_context *ctlr, TW_UINT8 q_type)
@@ -300,8 +281,6 @@ tw_cli_req_q_remove_head(struct tw_cli_ctlr_context *c
return(req);
}
-
-
/* Remove the given request from the given queue (q_type). */
static __inline TW_VOID
tw_cli_req_q_remove_item(struct tw_cli_req_context *req, TW_UINT8 q_type)
@@ -314,8 +293,6 @@ tw_cli_req_q_remove_item(struct tw_cli_req_context *re
tw_osl_free_lock(ctlr->ctlr_handle, ctlr->gen_lock);
}
-
-
/* Create an event packet for an event/error posted by the controller. */
#define tw_cli_create_ctlr_event(ctlr, event_src, cmd_hdr) do {\
svn commit: r365085 - in head/sys/dev/sound: . isa macio midi pci pci/hda pcm usb
Author: mjg
Date: Tue Sep 1 21:27:34 2020
New Revision: 365085
URL: https://svnweb.freebsd.org/changeset/base/365085
Log:
sound: clean up empty lines in .c and .h files
Modified:
head/sys/dev/sound/clone.h
head/sys/dev/sound/isa/ad1816.c
head/sys/dev/sound/isa/ad1816.h
head/sys/dev/sound/isa/ess.c
head/sys/dev/sound/isa/gusc.c
head/sys/dev/sound/isa/mss.c
head/sys/dev/sound/isa/mss.h
head/sys/dev/sound/isa/sb.h
head/sys/dev/sound/isa/sb16.c
head/sys/dev/sound/isa/sb8.c
head/sys/dev/sound/macio/aoa.c
head/sys/dev/sound/macio/aoa.h
head/sys/dev/sound/macio/davbus.c
head/sys/dev/sound/macio/davbusreg.h
head/sys/dev/sound/macio/i2s.c
head/sys/dev/sound/macio/snapper.c
head/sys/dev/sound/macio/tumbler.c
head/sys/dev/sound/midi/midi.c
head/sys/dev/sound/midi/mpu401.c
head/sys/dev/sound/midi/sequencer.c
head/sys/dev/sound/midi/sequencer.h
head/sys/dev/sound/pci/allegro_reg.h
head/sys/dev/sound/pci/als4000.c
head/sys/dev/sound/pci/atiixp.c
head/sys/dev/sound/pci/atiixp.h
head/sys/dev/sound/pci/aureal.c
head/sys/dev/sound/pci/aureal.h
head/sys/dev/sound/pci/cmi.c
head/sys/dev/sound/pci/csa.c
head/sys/dev/sound/pci/csareg.h
head/sys/dev/sound/pci/ds1-fw.h
head/sys/dev/sound/pci/ds1.c
head/sys/dev/sound/pci/ds1.h
head/sys/dev/sound/pci/emu10k1.c
head/sys/dev/sound/pci/emu10kx-midi.c
head/sys/dev/sound/pci/emu10kx-pcm.c
head/sys/dev/sound/pci/emu10kx.c
head/sys/dev/sound/pci/emu10kx.h
head/sys/dev/sound/pci/emuxkireg.h
head/sys/dev/sound/pci/envy24.c
head/sys/dev/sound/pci/envy24.h
head/sys/dev/sound/pci/envy24ht.c
head/sys/dev/sound/pci/envy24ht.h
head/sys/dev/sound/pci/es137x.c
head/sys/dev/sound/pci/fm801.c
head/sys/dev/sound/pci/hda/hda_reg.h
head/sys/dev/sound/pci/hda/hdaa.c
head/sys/dev/sound/pci/hda/hdac.c
head/sys/dev/sound/pci/hdspe-pcm.c
head/sys/dev/sound/pci/ich.c
head/sys/dev/sound/pci/ich.h
head/sys/dev/sound/pci/maestro.c
head/sys/dev/sound/pci/maestro3.c
head/sys/dev/sound/pci/maestro_reg.h
head/sys/dev/sound/pci/neomagic-coeff.h
head/sys/dev/sound/pci/neomagic.h
head/sys/dev/sound/pci/solo.c
head/sys/dev/sound/pci/t4dwave.c
head/sys/dev/sound/pci/t4dwave.h
head/sys/dev/sound/pci/via8233.c
head/sys/dev/sound/pci/via82c686.c
head/sys/dev/sound/pcm/channel.h
head/sys/dev/sound/pcm/dsp.c
head/sys/dev/sound/pcm/feeder.c
head/sys/dev/sound/pcm/feeder_eq.c
head/sys/dev/sound/pcm/feeder_matrix.c
head/sys/dev/sound/pcm/feeder_rate.c
head/sys/dev/sound/pcm/g711.h
head/sys/dev/sound/pcm/intpcm.h
head/sys/dev/sound/pcm/mixer.c
head/sys/dev/sound/pcm/sndstat.c
head/sys/dev/sound/pcm/sndstat.h
head/sys/dev/sound/pcm/sound.c
head/sys/dev/sound/pcm/sound.h
head/sys/dev/sound/pcm/vchan.c
head/sys/dev/sound/usb/uaudio.c
head/sys/dev/sound/usb/uaudio_pcm.c
head/sys/dev/sound/usb/uaudioreg.h
Modified: head/sys/dev/sound/clone.h
==
--- head/sys/dev/sound/clone.h Tue Sep 1 21:26:44 2020(r365084)
+++ head/sys/dev/sound/clone.h Tue Sep 1 21:27:34 2020(r365085)
@@ -99,7 +99,6 @@ struct snd_clone;
#define SND_CLONE_DEVMASK SND_CLONE_ALLOC
-
void snd_timestamp(struct timespec *);
struct snd_clone *snd_clone_create(int, int, int, uint32_t);
Modified: head/sys/dev/sound/isa/ad1816.c
==
--- head/sys/dev/sound/isa/ad1816.c Tue Sep 1 21:26:44 2020
(r365084)
+++ head/sys/dev/sound/isa/ad1816.c Tue Sep 1 21:27:34 2020
(r365085)
@@ -671,7 +671,6 @@ static device_method_t ad1816_methods[] = {
DEVMETHOD(device_probe, ad1816_probe),
DEVMETHOD(device_attach,ad1816_attach),
DEVMETHOD(device_detach,ad1816_detach),
-
{ 0, 0 }
};
@@ -685,5 +684,3 @@ DRIVER_MODULE(snd_ad1816, isa, ad1816_driver, pcm_devc
DRIVER_MODULE(snd_ad1816, acpi, ad1816_driver, pcm_devclass, 0, 0);
MODULE_DEPEND(snd_ad1816, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
MODULE_VERSION(snd_ad1816, 1);
-
-
Modified: head/sys/dev/sound/isa/ad1816.h
==
--- head/sys/dev/sound/isa/ad1816.h Tue Sep 1 21:26:44 2020
(r365084)
+++ head/sys/dev/sound/isa/ad1816.h Tue Sep 1 21:27:34 2020
(r365085)
@@ -94,4 +94,3 @@
#define AD1816_MIXER_DEVICES \
(SOUND_MASK_VOLUME | SOUND_MASK_PCM | SOUND_MASK_SYNTH | \
SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD | SOUND_MASK_IGAIN)
-
Modified: head/sys/dev/sound/isa/ess.c
==
--- head/sys/dev/sound/isa/ess.cTue Sep 1 21:26:44 2020
(r365084)
+++ head/sys/dev/sound/isa/ess.cTue Sep 1 21:27:34 2020
(r365085)
@@ -143,13 +143,11 @@ static int ess_stop(struct ess_chinfo *ch);
static void
svn commit: r365084 - in head/sys/dev/usb: . controller gadget input misc net quirk serial storage template video wlan
Author: mjg
Date: Tue Sep 1 21:26:44 2020
New Revision: 365084
URL: https://svnweb.freebsd.org/changeset/base/365084
Log:
usb: clean up empty lines in .c and .h files
Modified:
head/sys/dev/usb/controller/atmegadci.c
head/sys/dev/usb/controller/avr32dci.c
head/sys/dev/usb/controller/dwc_otg.c
head/sys/dev/usb/controller/dwc_otg_fdt.c
head/sys/dev/usb/controller/ehci.c
head/sys/dev/usb/controller/ehci.h
head/sys/dev/usb/controller/ehci_fsl.c
head/sys/dev/usb/controller/ehci_msm.c
head/sys/dev/usb/controller/generic_ehci_fdt.c
head/sys/dev/usb/controller/generic_xhci_fdt.c
head/sys/dev/usb/controller/musb_otg.c
head/sys/dev/usb/controller/ohci.c
head/sys/dev/usb/controller/saf1761_otg.c
head/sys/dev/usb/controller/uhci.c
head/sys/dev/usb/controller/usb_controller.c
head/sys/dev/usb/controller/uss820dci.c
head/sys/dev/usb/controller/xhci.c
head/sys/dev/usb/gadget/g_audio.c
head/sys/dev/usb/gadget/g_keyboard.c
head/sys/dev/usb/gadget/g_modem.c
head/sys/dev/usb/gadget/g_mouse.c
head/sys/dev/usb/input/atp.c
head/sys/dev/usb/input/uep.c
head/sys/dev/usb/input/uhid.c
head/sys/dev/usb/input/uhid_snes.c
head/sys/dev/usb/input/ukbd.c
head/sys/dev/usb/input/ums.c
head/sys/dev/usb/input/wmt.c
head/sys/dev/usb/input/wsp.c
head/sys/dev/usb/misc/cp2112.c
head/sys/dev/usb/misc/udbp.c
head/sys/dev/usb/misc/udbp.h
head/sys/dev/usb/misc/ugold.c
head/sys/dev/usb/net/if_aue.c
head/sys/dev/usb/net/if_axe.c
head/sys/dev/usb/net/if_axge.c
head/sys/dev/usb/net/if_cdce.c
head/sys/dev/usb/net/if_cdceem.c
head/sys/dev/usb/net/if_cue.c
head/sys/dev/usb/net/if_ipheth.c
head/sys/dev/usb/net/if_kue.c
head/sys/dev/usb/net/if_mos.c
head/sys/dev/usb/net/if_muge.c
head/sys/dev/usb/net/if_rue.c
head/sys/dev/usb/net/if_smsc.c
head/sys/dev/usb/net/if_udav.c
head/sys/dev/usb/net/if_urndisreg.h
head/sys/dev/usb/net/if_usie.c
head/sys/dev/usb/net/uhso.c
head/sys/dev/usb/net/usb_ethernet.c
head/sys/dev/usb/quirk/usb_quirk.c
head/sys/dev/usb/serial/u3g.c
head/sys/dev/usb/serial/uark.c
head/sys/dev/usb/serial/ubsa.c
head/sys/dev/usb/serial/ubser.c
head/sys/dev/usb/serial/uchcom.c
head/sys/dev/usb/serial/ucycom.c
head/sys/dev/usb/serial/ufoma.c
head/sys/dev/usb/serial/uftdi.c
head/sys/dev/usb/serial/ugensa.c
head/sys/dev/usb/serial/uipaq.c
head/sys/dev/usb/serial/ulpt.c
head/sys/dev/usb/serial/umcs.c
head/sys/dev/usb/serial/umct.c
head/sys/dev/usb/serial/umodem.c
head/sys/dev/usb/serial/umoscom.c
head/sys/dev/usb/serial/uplcom.c
head/sys/dev/usb/serial/usb_serial.c
head/sys/dev/usb/serial/uslcom.c
head/sys/dev/usb/serial/uvisor.c
head/sys/dev/usb/serial/uvscom.c
head/sys/dev/usb/storage/cfumass.c
head/sys/dev/usb/storage/umass.c
head/sys/dev/usb/storage/urio.c
head/sys/dev/usb/storage/ustorage_fs.c
head/sys/dev/usb/template/usb_template.c
head/sys/dev/usb/template/usb_template_kbd.c
head/sys/dev/usb/template/usb_template_mouse.c
head/sys/dev/usb/template/usb_template_phone.c
head/sys/dev/usb/usb_busdma.c
head/sys/dev/usb/usb_busdma.h
head/sys/dev/usb/usb_controller.h
head/sys/dev/usb/usb_core.h
head/sys/dev/usb/usb_dev.c
head/sys/dev/usb/usb_device.c
head/sys/dev/usb/usb_generic.c
head/sys/dev/usb/usb_handle_request.c
head/sys/dev/usb/usb_hid.c
head/sys/dev/usb/usb_hub.c
head/sys/dev/usb/usb_hub_acpi.c
head/sys/dev/usb/usb_hub_private.h
head/sys/dev/usb/usb_lookup.c
head/sys/dev/usb/usb_mbuf.c
head/sys/dev/usb/usb_msctest.c
head/sys/dev/usb/usb_pf.c
head/sys/dev/usb/usb_process.c
head/sys/dev/usb/usb_request.c
head/sys/dev/usb/usb_transfer.c
head/sys/dev/usb/usbdi.h
head/sys/dev/usb/video/udl.c
head/sys/dev/usb/wlan/if_rsu.c
head/sys/dev/usb/wlan/if_rumreg.h
head/sys/dev/usb/wlan/if_run.c
head/sys/dev/usb/wlan/if_runreg.h
head/sys/dev/usb/wlan/if_upgt.c
head/sys/dev/usb/wlan/if_ural.c
head/sys/dev/usb/wlan/if_uralreg.h
head/sys/dev/usb/wlan/if_uralvar.h
head/sys/dev/usb/wlan/if_urtw.c
head/sys/dev/usb/wlan/if_zyd.c
head/sys/dev/usb/wlan/if_zydreg.h
Modified: head/sys/dev/usb/controller/atmegadci.c
==
--- head/sys/dev/usb/controller/atmegadci.c Tue Sep 1 21:26:00 2020
(r365083)
+++ head/sys/dev/usb/controller/atmegadci.c Tue Sep 1 21:26:44 2020
(r365084)
@@ -116,7 +116,6 @@ static void atmegadci_root_intr(struct atmegadci_softc
*/
static const struct usb_hw_ep_profile
atmegadci_ep_profile[2] = {
-
[0] = {
.max_in_frame_size = 64,
.max_out_frame_size = 64,
@@ -152,7 +151,6 @@ atmegadci_clocks_on(struct atmegadci_softc *sc)
{
if (sc->sc_flags.clocks_off &&
sc->sc_flags.port_powered) {
-
DPRINTFN(5, "\n");
/* turn on clocks */
@@ -173,7 +171,6 @@ static void
atmegadci_clocks_off(struct atmegadci_softc *sc)
{
if
svn commit: r365083 - in head/sys/security: audit mac mac_biba mac_lomac mac_mls mac_stub mac_veriexec mac_veriexec_parser
Author: mjg
Date: Tue Sep 1 21:26:00 2020
New Revision: 365083
URL: https://svnweb.freebsd.org/changeset/base/365083
Log:
security: clean up empty lines in .c and .h files
Modified:
head/sys/security/audit/audit_bsm.c
head/sys/security/audit/audit_dtrace.c
head/sys/security/audit/audit_syscalls.c
head/sys/security/audit/bsm_token.c
head/sys/security/mac/mac_internal.h
head/sys/security/mac/mac_label.c
head/sys/security/mac/mac_socket.c
head/sys/security/mac_biba/mac_biba.c
head/sys/security/mac_lomac/mac_lomac.c
head/sys/security/mac_mls/mac_mls.c
head/sys/security/mac_stub/mac_stub.c
head/sys/security/mac_veriexec/veriexec_metadata.c
head/sys/security/mac_veriexec_parser/mac_veriexec_parser.c
Modified: head/sys/security/audit/audit_bsm.c
==
--- head/sys/security/audit/audit_bsm.c Tue Sep 1 21:25:39 2020
(r365082)
+++ head/sys/security/audit/audit_bsm.c Tue Sep 1 21:26:00 2020
(r365083)
@@ -318,7 +318,6 @@ kau_free(struct au_record *rec)
} \
} while (0)
-
/*
* Implement auditing for the auditon() system call. The audit tokens that
* are generated depend on the command that was sent into the auditon()
Modified: head/sys/security/audit/audit_dtrace.c
==
--- head/sys/security/audit/audit_dtrace.c Tue Sep 1 21:25:39 2020
(r365082)
+++ head/sys/security/audit/audit_dtrace.c Tue Sep 1 21:26:00 2020
(r365083)
@@ -383,7 +383,6 @@ dtaudit_au_evnamemap_callback(struct evname_elem *ene)
if ((ene->ene_commit_probe_id == 0) &&
(dtrace_probe_lookup(dtaudit_id, dtaudit_module_str,
ene_name_lower, dtaudit_name_commit_str) == 0)) {
-
/*
* Create the commit probe.
*
@@ -413,7 +412,6 @@ dtaudit_au_evnamemap_callback(struct evname_elem *ene)
if ((ene->ene_bsm_probe_id == 0) &&
(dtrace_probe_lookup(dtaudit_id, dtaudit_module_str,
ene_name_lower, dtaudit_name_bsm_str) == 0)) {
-
/*
* Create the bsm probe.
*
Modified: head/sys/security/audit/audit_syscalls.c
==
--- head/sys/security/audit/audit_syscalls.cTue Sep 1 21:25:39 2020
(r365082)
+++ head/sys/security/audit/audit_syscalls.cTue Sep 1 21:26:00 2020
(r365083)
@@ -90,7 +90,6 @@ sys_audit(struct thread *td, struct audit_args *uap)
* commit the user audit record.
*/
if (ar == NULL) {
-
/*
* This is not very efficient; we're required to allocate a
* complete kernel audit record just so the user record can
Modified: head/sys/security/audit/bsm_token.c
==
--- head/sys/security/audit/bsm_token.c Tue Sep 1 21:25:39 2020
(r365082)
+++ head/sys/security/audit/bsm_token.c Tue Sep 1 21:26:00 2020
(r365083)
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-
#include
#include
#include
@@ -341,7 +340,6 @@ au_to_data(char unit_print, char unit_type, char unit_
return (t);
}
-
/*
* token ID1 byte
Modified: head/sys/security/mac/mac_internal.h
==
--- head/sys/security/mac/mac_internal.hTue Sep 1 21:25:39 2020
(r365082)
+++ head/sys/security/mac/mac_internal.hTue Sep 1 21:26:00 2020
(r365083)
@@ -160,7 +160,6 @@ struct label {
intptr_tl_perpolicy[MAC_MAX_SLOTS];
};
-
/*
* Flags for mac_labeled, a bitmask of object types need across the union of
* all policies currently registered with the MAC Framework, used to key
Modified: head/sys/security/mac/mac_label.c
==
--- head/sys/security/mac/mac_label.c Tue Sep 1 21:25:39 2020
(r365082)
+++ head/sys/security/mac/mac_label.c Tue Sep 1 21:26:00 2020
(r365083)
@@ -93,7 +93,6 @@ mac_destroy_label(struct label *label)
#endif
}
-
static int
mac_labelzone_ctor(void *mem, int size, void *arg, int flags)
{
Modified: head/sys/security/mac/mac_socket.c
==
--- head/sys/security/mac/mac_socket.c Tue Sep 1 21:25:39 2020
(r365082)
+++ head/sys/security/mac/mac_socket.c Tue Sep 1 21:26:00 2020
(r365083)
@@ -275,7 +275,7 @@ mac_socketpeer_set_from_mbuf(struct mbuf *m, struct so
void
mac_socketpeer_set_from_socket(struct socket *oldso, struct socket *newso)
{
-
+
if (mac_policy_count == 0)
return;
Modified:
svn commit: r365081 - head/sys/libkern
Author: mjg
Date: Tue Sep 1 21:25:23 2020
New Revision: 365081
URL: https://svnweb.freebsd.org/changeset/base/365081
Log:
libkern: clean up empty lines in .c and .h files
Modified:
head/sys/libkern/bcopy.c
head/sys/libkern/gsb_crc32.c
head/sys/libkern/iconv_ucs.c
head/sys/libkern/iconv_xlat16.c
head/sys/libkern/inet_aton.c
head/sys/libkern/inet_ntoa.c
head/sys/libkern/mcount.c
head/sys/libkern/murmur3_32.c
head/sys/libkern/ucmpdi2.c
Modified: head/sys/libkern/bcopy.c
==
--- head/sys/libkern/bcopy.cTue Sep 1 21:24:33 2020(r365080)
+++ head/sys/libkern/bcopy.cTue Sep 1 21:25:23 2020(r365081)
@@ -154,4 +154,3 @@ void
memcpy(dst0, src0, length);
}
-
Modified: head/sys/libkern/gsb_crc32.c
==
--- head/sys/libkern/gsb_crc32.cTue Sep 1 21:24:33 2020
(r365080)
+++ head/sys/libkern/gsb_crc32.cTue Sep 1 21:25:23 2020
(r365081)
@@ -220,7 +220,6 @@ singletable_crc32c(uint32_t crc, const void *buf, size
{
const uint8_t *p = buf;
-
while (size--)
crc = crc32Table[(crc ^ *p++) & 0xff] ^ (crc >> 8);
@@ -295,8 +294,6 @@ static const uint32_t sctp_crc_tableil8_o32[256] =
* end of the CRC lookup table crc_tableil8_o32
*/
-
-
/*
* The following CRC lookup table was generated automagically using the
* following model parameters:
@@ -351,8 +348,6 @@ static const uint32_t sctp_crc_tableil8_o40[256] =
* end of the CRC lookup table crc_tableil8_o40
*/
-
-
/*
* The following CRC lookup table was generated automagically using the
* following model parameters:
@@ -407,8 +402,6 @@ static const uint32_t sctp_crc_tableil8_o48[256] =
* end of the CRC lookup table crc_tableil8_o48
*/
-
-
/*
* The following CRC lookup table was generated automagically using the
* following model parameters:
@@ -463,8 +456,6 @@ static const uint32_t sctp_crc_tableil8_o56[256] =
* end of the CRC lookup table crc_tableil8_o56
*/
-
-
/*
* The following CRC lookup table was generated automagically using the
* following model parameters:
@@ -519,8 +510,6 @@ static const uint32_t sctp_crc_tableil8_o64[256] =
* end of the CRC lookup table crc_tableil8_o64
*/
-
-
/*
* The following CRC lookup table was generated automagically using the
* following model parameters:
@@ -575,8 +564,6 @@ static const uint32_t sctp_crc_tableil8_o72[256] =
* end of the CRC lookup table crc_tableil8_o72
*/
-
-
/*
* The following CRC lookup table was generated automagically using the
* following model parameters:
@@ -631,8 +618,6 @@ static const uint32_t sctp_crc_tableil8_o80[256] =
* end of the CRC lookup table crc_tableil8_o80
*/
-
-
/*
* The following CRC lookup table was generated automagically using the
* following model parameters:
@@ -686,7 +671,6 @@ static const uint32_t sctp_crc_tableil8_o88[256] =
/*
* end of the CRC lookup table crc_tableil8_o88
*/
-
static uint32_t
crc32c_sb8_64_bit(uint32_t crc,
Modified: head/sys/libkern/iconv_ucs.c
==
--- head/sys/libkern/iconv_ucs.cTue Sep 1 21:24:33 2020
(r365080)
+++ head/sys/libkern/iconv_ucs.cTue Sep 1 21:25:23 2020
(r365081)
@@ -186,7 +186,6 @@ iconv_ucs_conv(void *d2p, const char **inbuf,
dst = *outbuf;
while (ir > 0 && or > 0) {
-
/*
* The first half of conversion.
* (convert any code into ENCODING_UNICODE)
@@ -537,4 +536,3 @@ decode_surrogate(const u_char *ucs)
return ucs[0] & 0x3) << 18) | (ucs[1] << 10) |
((ucs[2] & 0x3) << 8) | ucs[3]) + 0x1);
}
-
Modified: head/sys/libkern/iconv_xlat16.c
==
--- head/sys/libkern/iconv_xlat16.c Tue Sep 1 21:24:33 2020
(r365080)
+++ head/sys/libkern/iconv_xlat16.c Tue Sep 1 21:25:23 2020
(r365081)
@@ -131,7 +131,6 @@ iconv_xlat16_conv(void *d2p, const char **inbuf,
dst = *outbuf;
while(ir > 0 && or > 0) {
-
inlen = 0;
code = 0;
Modified: head/sys/libkern/inet_aton.c
==
--- head/sys/libkern/inet_aton.cTue Sep 1 21:24:33 2020
(r365080)
+++ head/sys/libkern/inet_aton.cTue Sep 1 21:25:23 2020
(r365081)
@@ -94,12 +94,10 @@ inet_aton(const char *cp, struct in_addr *addr)
gotend = 1;
break;
} else {
-
/* Invalid character, then fail. */
return (0);
}
}
-
}
/* Concoct
svn commit: r365080 - in head/sys/compat: cloudabi32 cloudabi64 freebsd32 ia32 lindebugfs linprocfs linux linuxkpi/common/include/asm linuxkpi/common/include/linux linuxkpi/common/include/net linux...
Author: mjg
Date: Tue Sep 1 21:24:33 2020
New Revision: 365080
URL: https://svnweb.freebsd.org/changeset/base/365080
Log:
compat: clean up empty lines in .c and .h files
Modified:
head/sys/compat/cloudabi32/cloudabi32_proto.h
head/sys/compat/cloudabi64/cloudabi64_proto.h
head/sys/compat/freebsd32/freebsd32_ipc.h
head/sys/compat/freebsd32/freebsd32_misc.c
head/sys/compat/freebsd32/freebsd32_proto.h
head/sys/compat/ia32/ia32_signal.h
head/sys/compat/lindebugfs/lindebugfs.c
head/sys/compat/linprocfs/linprocfs.c
head/sys/compat/linux/linux_common.c
head/sys/compat/linux/linux_event.c
head/sys/compat/linux/linux_file.c
head/sys/compat/linux/linux_fork.c
head/sys/compat/linux/linux_futex.c
head/sys/compat/linux/linux_ioctl.c
head/sys/compat/linux/linux_ipc.c
head/sys/compat/linux/linux_misc.c
head/sys/compat/linux/linux_misc.h
head/sys/compat/linux/linux_mmap.c
head/sys/compat/linux/linux_signal.c
head/sys/compat/linux/linux_socket.c
head/sys/compat/linux/linux_stats.c
head/sys/compat/linux/linux_time.c
head/sys/compat/linux/linux_timer.c
head/sys/compat/linux/linux_vdso.c
head/sys/compat/linuxkpi/common/include/asm/atomic-long.h
head/sys/compat/linuxkpi/common/include/asm/atomic.h
head/sys/compat/linuxkpi/common/include/asm/atomic64.h
head/sys/compat/linuxkpi/common/include/linux/compat.h
head/sys/compat/linuxkpi/common/include/linux/dma-attrs.h
head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
head/sys/compat/linuxkpi/common/include/linux/dmapool.h
head/sys/compat/linuxkpi/common/include/linux/fs.h
head/sys/compat/linuxkpi/common/include/linux/io.h
head/sys/compat/linuxkpi/common/include/linux/jhash.h
head/sys/compat/linuxkpi/common/include/linux/kmod.h
head/sys/compat/linuxkpi/common/include/linux/kref.h
head/sys/compat/linuxkpi/common/include/linux/list.h
head/sys/compat/linuxkpi/common/include/linux/pci.h
head/sys/compat/linuxkpi/common/include/linux/scatterlist.h
head/sys/compat/linuxkpi/common/include/linux/sysfs.h
head/sys/compat/linuxkpi/common/include/net/ipv6.h
head/sys/compat/linuxkpi/common/src/linux_compat.c
head/sys/compat/linuxkpi/common/src/linux_hrtimer.c
head/sys/compat/linuxkpi/common/src/linux_idr.c
head/sys/compat/linuxkpi/common/src/linux_kmod.c
head/sys/compat/linuxkpi/common/src/linux_pci.c
head/sys/compat/linuxkpi/common/src/linux_radix.c
head/sys/compat/linuxkpi/common/src/linux_rcu.c
head/sys/compat/linuxkpi/common/src/linux_seq_file.c
head/sys/compat/linuxkpi/common/src/linux_usb.c
head/sys/compat/ndis/kern_ndis.c
head/sys/compat/ndis/kern_windrv.c
head/sys/compat/ndis/ndis_var.h
head/sys/compat/ndis/ntoskrnl_var.h
head/sys/compat/ndis/pe_var.h
head/sys/compat/ndis/subr_hal.c
head/sys/compat/ndis/subr_ndis.c
head/sys/compat/ndis/subr_ntoskrnl.c
head/sys/compat/ndis/subr_usbd.c
Modified: head/sys/compat/cloudabi32/cloudabi32_proto.h
==
--- head/sys/compat/cloudabi32/cloudabi32_proto.h Tue Sep 1 21:23:59
2020(r365079)
+++ head/sys/compat/cloudabi32/cloudabi32_proto.h Tue Sep 1 21:24:33
2020(r365080)
@@ -324,42 +324,29 @@ int cloudabi_sys_thread_yield(struct thread *,
struct
#ifdef COMPAT_43
-
#endif /* COMPAT_43 */
-
#ifdef COMPAT_FREEBSD4
-
#endif /* COMPAT_FREEBSD4 */
-
#ifdef COMPAT_FREEBSD6
-
#endif /* COMPAT_FREEBSD6 */
-
#ifdef COMPAT_FREEBSD7
-
#endif /* COMPAT_FREEBSD7 */
-
#ifdef COMPAT_FREEBSD10
-
#endif /* COMPAT_FREEBSD10 */
-
#ifdef COMPAT_FREEBSD11
-
#endif /* COMPAT_FREEBSD11 */
-
#ifdef COMPAT_FREEBSD12
-
#endif /* COMPAT_FREEBSD12 */
Modified: head/sys/compat/cloudabi64/cloudabi64_proto.h
==
--- head/sys/compat/cloudabi64/cloudabi64_proto.h Tue Sep 1 21:23:59
2020(r365079)
+++ head/sys/compat/cloudabi64/cloudabi64_proto.h Tue Sep 1 21:24:33
2020(r365080)
@@ -324,42 +324,29 @@ int cloudabi_sys_thread_yield(struct thread *,
struct
#ifdef COMPAT_43
-
#endif /* COMPAT_43 */
-
#ifdef COMPAT_FREEBSD4
-
#endif /* COMPAT_FREEBSD4 */
-
#ifdef COMPAT_FREEBSD6
-
#endif /* COMPAT_FREEBSD6 */
-
#ifdef COMPAT_FREEBSD7
-
#endif /* COMPAT_FREEBSD7 */
-
#ifdef COMPAT_FREEBSD10
-
#endif /* COMPAT_FREEBSD10 */
-
#ifdef COMPAT_FREEBSD11
-
#endif /* COMPAT_FREEBSD11 */
-
#ifdef COMPAT_FREEBSD12
-
#endif /* COMPAT_FREEBSD12 */
Modified: head/sys/compat/freebsd32/freebsd32_ipc.h
==
--- head/sys/compat/freebsd32/freebsd32_ipc.h Tue Sep 1 21:23:59 2020
(r365079)
+++ head/sys/compat/freebsd32/freebsd32_ipc.h Tue Sep 1 21:24:33 2020
(r365080)
@@ -60,7 +60,6 @@ struct semid_kernel32 {
};
#endif /* _KERNEL */
-
union semun32 {
int
svn commit: r365082 - in head/sys: nfs nfsclient nfsserver
Author: mjg
Date: Tue Sep 1 21:25:39 2020
New Revision: 365082
URL: https://svnweb.freebsd.org/changeset/base/365082
Log:
nfs: clean up empty lines in .c and .h files
Modified:
head/sys/nfs/bootp_subr.c
head/sys/nfs/nfs_diskless.c
head/sys/nfs/nfs_kdtrace.h
head/sys/nfs/nfs_nfssvc.c
head/sys/nfs/nfsproto.h
head/sys/nfs/xdr_subs.h
head/sys/nfsclient/nfs.h
head/sys/nfsclient/nfsnode.h
head/sys/nfsserver/nfsm_subs.h
Modified: head/sys/nfs/bootp_subr.c
==
--- head/sys/nfs/bootp_subr.c Tue Sep 1 21:25:23 2020(r365081)
+++ head/sys/nfs/bootp_subr.c Tue Sep 1 21:25:39 2020(r365082)
@@ -459,7 +459,6 @@ bootpc_received(struct bootpc_globalcontext *gctx,
ifctx->dhcpquerytype == DHCP_REQUEST)
ifctx->state = IF_DHCP_RESOLVED;
-
if (ifctx->dhcpquerytype == DHCP_DISCOVER &&
ifctx->state != IF_BOOTP_RESOLVED) {
p = bootpc_tag(>tmptag, >reply,
@@ -567,7 +566,6 @@ bootpc_call(struct bootpc_globalcontext *gctx, struct
timo = 0;
rtimo = 0;
for (;;) {
-
outstanding = 0;
gotrootpath = 0;
Modified: head/sys/nfs/nfs_diskless.c
==
--- head/sys/nfs/nfs_diskless.c Tue Sep 1 21:25:23 2020(r365081)
+++ head/sys/nfs/nfs_diskless.c Tue Sep 1 21:25:39 2020(r365082)
@@ -253,7 +253,7 @@ match_done:
if (is_nfsv3 != 0) {
strlcpy(nd3->myif.ifra_name, ifp->if_xname,
sizeof(nd3->myif.ifra_name));
-
+
/* set up gateway */
inaddr_to_sockaddr("boot.netif.gateway", >mygateway);
@@ -287,12 +287,12 @@ match_done:
nfs_parse_options(cp, >root_args);
freeenv(cp);
}
-
+
nfs_diskless_valid = 3;
} else {
strlcpy(nd->myif.ifra_name, ifp->if_xname,
sizeof(nd->myif.ifra_name));
-
+
/* set up gateway */
inaddr_to_sockaddr("boot.netif.gateway", >mygateway);
@@ -319,7 +319,7 @@ match_done:
}
if ((cp = kern_getenv("boot.nfsroot.options")) != NULL) {
struct nfs_args args;
-
+
/*
* XXX yech, convert between old and current
* arg format
@@ -335,7 +335,7 @@ match_done:
nd->root_args.wsize = args.wsize;
freeenv(cp);
}
-
+
nfs_diskless_valid = 1;
}
}
@@ -436,4 +436,3 @@ nfs_rootconf(void)
SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, nfs_rootconf, NULL);
#endif
-
Modified: head/sys/nfs/nfs_kdtrace.h
==
--- head/sys/nfs/nfs_kdtrace.h Tue Sep 1 21:25:23 2020(r365081)
+++ head/sys/nfs/nfs_kdtrace.h Tue Sep 1 21:25:39 2020(r365082)
@@ -57,7 +57,7 @@ extern uint32_t nfsclient_accesscache_load_done_id;
nfsclient_accesscache_get_hit_id, (vp), (uid), \
(mode));\
} while (0)
-
+
#defineKDTRACE_NFS_ACCESSCACHE_GET_MISS(vp, uid, mode) do {
\
if (dtrace_nfsclient_accesscache_get_miss_probe != NULL)\
(dtrace_nfsclient_accesscache_get_miss_probe)( \
Modified: head/sys/nfs/nfs_nfssvc.c
==
--- head/sys/nfs/nfs_nfssvc.c Tue Sep 1 21:25:23 2020(r365081)
+++ head/sys/nfs/nfs_nfssvc.c Tue Sep 1 21:25:39 2020(r365082)
@@ -151,4 +151,3 @@ DECLARE_MODULE(nfssvc, nfssvc_mod, SI_SUB_VFS, SI_ORDE
/* So that loader and kldload(2) can find us, wherever we are.. */
MODULE_VERSION(nfssvc, 1);
-
Modified: head/sys/nfs/nfsproto.h
==
--- head/sys/nfs/nfsproto.h Tue Sep 1 21:25:23 2020(r365081)
+++ head/sys/nfs/nfsproto.h Tue Sep 1 21:25:39 2020(r365082)
@@ -137,8 +137,6 @@
#defineNFSERR_FILE_OPEN10046
#defineNFSERR_STALEWRITEVERF 30001 /* Fake return for nfs_commit()
*/
-
-
#define NFSERR_RETVOID 0x2000 /* Return void, not error */
#define NFSERR_AUTHERR 0x4000 /* Mark an authentication error */
#define NFSERR_RETERR 0x8000 /* Mark an error return for V3 */
Modified: head/sys/nfs/xdr_subs.h
==
--- head/sys/nfs/xdr_subs.h Tue Sep 1 21:25:23 2020(r365081)
+++ head/sys/nfs/xdr_subs.h Tue Sep 1 21:25:39 2020(r365082)
@@ -35,7 +35,6 @@
*
svn commit: r365079 - in head/sys/x86: acpica cpufreq include iommu isa pci x86 xen
Author: mjg
Date: Tue Sep 1 21:23:59 2020
New Revision: 365079
URL: https://svnweb.freebsd.org/changeset/base/365079
Log:
x86: clean up empty lines in .c and .h files
Modified:
head/sys/x86/acpica/madt.c
head/sys/x86/cpufreq/est.c
head/sys/x86/cpufreq/hwpstate_amd.c
head/sys/x86/cpufreq/p4tcc.c
head/sys/x86/cpufreq/powernow.c
head/sys/x86/cpufreq/smist.c
head/sys/x86/include/acpica_machdep.h
head/sys/x86/include/apicreg.h
head/sys/x86/include/apicvar.h
head/sys/x86/include/apm_bios.h
head/sys/x86/include/bus.h
head/sys/x86/include/bus_dma.h
head/sys/x86/include/elf.h
head/sys/x86/iommu/intel_drv.c
head/sys/x86/iommu/intel_idpgtbl.c
head/sys/x86/isa/atpic.c
head/sys/x86/isa/atrtc.c
head/sys/x86/isa/clock.c
head/sys/x86/isa/isa.c
head/sys/x86/isa/isa_dma.c
head/sys/x86/isa/nmi.c
head/sys/x86/isa/orm.c
head/sys/x86/pci/pci_bus.c
head/sys/x86/pci/qpi.c
head/sys/x86/x86/busdma_bounce.c
head/sys/x86/x86/identcpu.c
head/sys/x86/x86/io_apic.c
head/sys/x86/x86/legacy.c
head/sys/x86/x86/local_apic.c
head/sys/x86/x86/mca.c
head/sys/x86/x86/mp_x86.c
head/sys/x86/x86/mptable.c
head/sys/x86/x86/mptable_pci.c
head/sys/x86/x86/nexus.c
head/sys/x86/x86/x86_mem.c
head/sys/x86/xen/hvm.c
head/sys/x86/xen/pv.c
head/sys/x86/xen/xen_apic.c
head/sys/x86/xen/xen_intr.c
head/sys/x86/xen/xen_nexus.c
Modified: head/sys/x86/acpica/madt.c
==
--- head/sys/x86/acpica/madt.c Tue Sep 1 21:23:00 2020(r365078)
+++ head/sys/x86/acpica/madt.c Tue Sep 1 21:23:59 2020(r365079)
@@ -405,7 +405,6 @@ madt_setup_cpus_handler(ACPI_SUBTABLE_HEADER *entry, v
}
}
-
/*
* Add an I/O APIC from an entry in the table.
*/
Modified: head/sys/x86/cpufreq/est.c
==
--- head/sys/x86/cpufreq/est.c Tue Sep 1 21:23:00 2020(r365078)
+++ head/sys/x86/cpufreq/est.c Tue Sep 1 21:23:59 2020(r365079)
@@ -888,7 +888,6 @@ static device_method_t est_methods[] = {
/* ACPI interface */
DEVMETHOD(acpi_get_features,est_features),
-
{0, 0}
};
Modified: head/sys/x86/cpufreq/hwpstate_amd.c
==
--- head/sys/x86/cpufreq/hwpstate_amd.c Tue Sep 1 21:23:00 2020
(r365078)
+++ head/sys/x86/cpufreq/hwpstate_amd.c Tue Sep 1 21:23:59 2020
(r365079)
@@ -153,7 +153,6 @@ static device_method_t hwpstate_methods[] = {
/* ACPI interface */
DEVMETHOD(acpi_get_features,hwpstate_features),
-
{0, 0}
};
Modified: head/sys/x86/cpufreq/p4tcc.c
==
--- head/sys/x86/cpufreq/p4tcc.cTue Sep 1 21:23:00 2020
(r365078)
+++ head/sys/x86/cpufreq/p4tcc.cTue Sep 1 21:23:59 2020
(r365079)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
#include
#include "acpi_if.h"
-
+
struct p4tcc_softc {
device_tdev;
int set_count;
@@ -97,7 +97,6 @@ static device_method_t p4tcc_methods[] = {
/* ACPI interface */
DEVMETHOD(acpi_get_features,p4tcc_features),
-
{0, 0}
};
Modified: head/sys/x86/cpufreq/powernow.c
==
--- head/sys/x86/cpufreq/powernow.c Tue Sep 1 21:23:00 2020
(r365078)
+++ head/sys/x86/cpufreq/powernow.c Tue Sep 1 21:23:59 2020
(r365079)
@@ -146,7 +146,6 @@ struct pst_header {
#define ACPI_PN8_CTRL_TO_RVO(x)(((x) >> 28) & 0x03)
#define ACPI_PN8_CTRL_TO_IRT(x)(((x) >> 30) & 0x03)
-
#define WRITE_FIDVID(fid, vid, ctrl) \
wrmsr(MSR_AMDK7_FIDVID_CTL, \
(((ctrl) << 32) | (1ULL << 16) | ((vid) << 8) | (fid)))
@@ -169,7 +168,6 @@ static int pn7_fid_to_mult[32] = {
150, 225, 160, 165, 170, 180, 0, 0,
};
-
static int pn8_fid_to_mult[64] = {
40, 45, 50, 55, 60, 65, 70, 75,
80, 85, 90, 95, 100, 105, 110, 115,
@@ -262,7 +260,6 @@ static device_method_t pn_methods[] = {
DEVMETHOD(cpufreq_drv_get, pn_get),
DEVMETHOD(cpufreq_drv_settings, pn_settings),
DEVMETHOD(cpufreq_drv_type, pn_type),
-
{0, 0}
};
Modified: head/sys/x86/cpufreq/smist.c
==
--- head/sys/x86/cpufreq/smist.cTue Sep 1 21:23:00 2020
(r365078)
+++ head/sys/x86/cpufreq/smist.cTue Sep 1 21:23:59 2020
(r365079)
@@ -100,7 +100,6 @@ static device_method_t smist_methods[] = {
DEVMETHOD(cpufreq_drv_get, smist_get),
DEVMETHOD(cpufreq_drv_type, smist_type),
DEVMETHOD(cpufreq_drv_settings, smist_settings),
-
{0, 0}
};
Modified: head/sys/x86/include/acpica_machdep.h
svn commit: r365078 - in head/sys/ufs: ffs ufs
Author: mjg
Date: Tue Sep 1 21:23:00 2020
New Revision: 365078
URL: https://svnweb.freebsd.org/changeset/base/365078
Log:
ufs: clean up empty lines in .c and .h files
Modified:
head/sys/ufs/ffs/ffs_alloc.c
head/sys/ufs/ffs/ffs_balloc.c
head/sys/ufs/ffs/ffs_extern.h
head/sys/ufs/ffs/ffs_inode.c
head/sys/ufs/ffs/ffs_rawread.c
head/sys/ufs/ffs/ffs_softdep.c
head/sys/ufs/ffs/ffs_subr.c
head/sys/ufs/ffs/ffs_vfsops.c
head/sys/ufs/ffs/ffs_vnops.c
head/sys/ufs/ufs/dirhash.h
head/sys/ufs/ufs/inode.h
head/sys/ufs/ufs/ufs_acl.c
head/sys/ufs/ufs/ufs_bmap.c
head/sys/ufs/ufs/ufs_dirhash.c
head/sys/ufs/ufs/ufs_extattr.c
head/sys/ufs/ufs/ufs_vfsops.c
head/sys/ufs/ufs/ufs_vnops.c
Modified: head/sys/ufs/ffs/ffs_alloc.c
==
--- head/sys/ufs/ffs/ffs_alloc.cTue Sep 1 21:21:55 2020
(r365077)
+++ head/sys/ufs/ffs/ffs_alloc.cTue Sep 1 21:23:00 2020
(r365078)
@@ -550,7 +550,7 @@ ffs_reallocblks(ap)
return (ffs_reallocblks_ufs1(ap));
return (ffs_reallocblks_ufs2(ap));
}
-
+
static int
ffs_reallocblks_ufs1(ap)
struct vop_reallocblks_args /* {
@@ -3243,7 +3243,6 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS)
filetype = IFREG;
switch (oidp->oid_number) {
-
case FFS_SET_FLAGS:
#ifdef DIAGNOSTIC
if (fsckcmds)
@@ -3511,7 +3510,6 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS)
#endif /* DIAGNOSTIC */
error = EINVAL;
break;
-
}
fdrop(fp, td);
vn_finished_write(mp);
Modified: head/sys/ufs/ffs/ffs_balloc.c
==
--- head/sys/ufs/ffs/ffs_balloc.c Tue Sep 1 21:21:55 2020
(r365077)
+++ head/sys/ufs/ffs/ffs_balloc.c Tue Sep 1 21:23:00 2020
(r365078)
@@ -615,7 +615,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, i
if (DOINGSOFTDEP(vp))
softdep_prealloc(vp, MNT_WAIT);
-
+
/*
* Check for allocating external data.
*/
Modified: head/sys/ufs/ffs/ffs_extern.h
==
--- head/sys/ufs/ffs/ffs_extern.h Tue Sep 1 21:21:55 2020
(r365077)
+++ head/sys/ufs/ffs/ffs_extern.h Tue Sep 1 21:23:00 2020
(r365078)
@@ -202,7 +202,6 @@ voidsoftdep_buf_append(struct buf *, struct
workhead
void softdep_inode_append(struct inode *, struct ucred *, struct workhead *);
void softdep_freework(struct workhead *);
-
/*
* Things to request flushing in softdep_request_cleanup()
*/
Modified: head/sys/ufs/ffs/ffs_inode.c
==
--- head/sys/ufs/ffs/ffs_inode.cTue Sep 1 21:21:55 2020
(r365077)
+++ head/sys/ufs/ffs/ffs_inode.cTue Sep 1 21:23:00 2020
(r365078)
@@ -517,7 +517,7 @@ ffs_truncate(vp, length, flags, cred)
}
UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE);
allerror = ffs_update(vp, waitforupdate);
-
+
/*
* Having written the new inode to disk, save its new configuration
* and put back the old block pointers long enough to process them.
@@ -795,4 +795,3 @@ ffs_rdonly(struct inode *ip)
return (ITOFS(ip)->fs_ronly != 0);
}
-
Modified: head/sys/ufs/ffs/ffs_rawread.c
==
--- head/sys/ufs/ffs/ffs_rawread.c Tue Sep 1 21:21:55 2020
(r365077)
+++ head/sys/ufs/ffs/ffs_rawread.c Tue Sep 1 21:23:00 2020
(r365078)
@@ -183,7 +183,6 @@ ffs_rawread_sync(struct vnode *vp)
return 0;
}
-
static int
ffs_rawread_readahead(struct vnode *vp,
caddr_t udata,
@@ -201,9 +200,9 @@ ffs_rawread_readahead(struct vnode *vp,
int bforwards;
struct inode *ip;
ufs2_daddr_t blkno;
-
+
bsize = vp->v_mount->mnt_stat.f_iosize;
-
+
ip = VTOI(vp);
dp = ITODEVVP(ip);
@@ -223,14 +222,13 @@ ffs_rawread_readahead(struct vnode *vp,
if ((daddr_t) blockno != blockno) {
return EINVAL; /* blockno overflow */
}
-
+
bp->b_lblkno = bp->b_blkno = blockno;
-
+
error = ufs_bmaparray(vp, bp->b_lblkno, , NULL, , NULL);
if (error != 0)
return error;
if (blkno == -1) {
-
/* Fill holes with NULs to preserve semantics */
if (bp->b_bcount + blockoff * DEV_BSIZE > bsize)
@@ -251,19 +249,18 @@ ffs_rawread_readahead(struct vnode *vp,
}
bp->b_blkno = blkno + blockoff;
bp->b_offset = bp->b_iooffset = (blkno + blockoff) * DEV_BSIZE;
-
+
if (bp->b_bcount + blockoff * DEV_BSIZE > bsize * (1 + bforwards))
bp->b_bcount
svn commit: r365077 - in head/sys/xen: . interface interface/arch-x86 interface/arch-x86/hvm interface/hvm interface/io xenbus xenstore
Author: mjg
Date: Tue Sep 1 21:21:55 2020
New Revision: 365077
URL: https://svnweb.freebsd.org/changeset/base/365077
Log:
xen: clean up empty lines in .c and .h files
Modified:
head/sys/xen/hypervisor.h
head/sys/xen/interface/arch-x86/hvm/save.h
head/sys/xen/interface/arch-x86/pmu.h
head/sys/xen/interface/arch-x86/xen-mca.h
head/sys/xen/interface/arch-x86/xen.h
head/sys/xen/interface/domctl.h
head/sys/xen/interface/elfnote.h
head/sys/xen/interface/errno.h
head/sys/xen/interface/gcov.h
head/sys/xen/interface/grant_table.h
head/sys/xen/interface/hvm/ioreq.h
head/sys/xen/interface/hvm/save.h
head/sys/xen/interface/io/fsif.h
head/sys/xen/interface/io/libxenvchan.h
head/sys/xen/interface/io/tpmif.h
head/sys/xen/interface/io/vscsiif.h
head/sys/xen/interface/kexec.h
head/sys/xen/interface/memory.h
head/sys/xen/interface/physdev.h
head/sys/xen/xenbus/xenbusb.c
head/sys/xen/xenbus/xenbusb.h
head/sys/xen/xenbus/xenbusb_back.c
head/sys/xen/xenbus/xenbusb_front.c
head/sys/xen/xenstore/xenstorevar.h
Modified: head/sys/xen/hypervisor.h
==
--- head/sys/xen/hypervisor.h Tue Sep 1 21:21:19 2020(r365076)
+++ head/sys/xen/hypervisor.h Tue Sep 1 21:21:55 2020(r365077)
@@ -55,7 +55,6 @@ HYPERVISOR_block(
return (rc);
}
-
static inline void
HYPERVISOR_shutdown(unsigned int reason)
{
Modified: head/sys/xen/interface/arch-x86/hvm/save.h
==
--- head/sys/xen/interface/arch-x86/hvm/save.h Tue Sep 1 21:21:19 2020
(r365076)
+++ head/sys/xen/interface/arch-x86/hvm/save.h Tue Sep 1 21:21:55 2020
(r365077)
@@ -43,7 +43,6 @@ struct hvm_save_header {
DECLARE_HVM_SAVE_TYPE(HEADER, 1, struct hvm_save_header);
-
/*
* Processor
*
@@ -269,7 +268,6 @@ struct hvm_hw_cpu_compat {
};
static inline int _hvm_hw_fix_cpu(void *h) {
-
union hvm_hw_cpu_union {
struct hvm_hw_cpu nat;
struct hvm_hw_cpu_compat cmp;
@@ -342,7 +340,6 @@ struct hvm_hw_vpic {
DECLARE_HVM_SAVE_TYPE(PIC, 3, struct hvm_hw_vpic);
-
/*
* IO-APIC
*/
@@ -374,7 +371,6 @@ struct hvm_hw_vioapic {
DECLARE_HVM_SAVE_TYPE(IOAPIC, 4, struct hvm_hw_vioapic);
-
/*
* LAPIC
*/
@@ -394,7 +390,6 @@ struct hvm_hw_lapic_regs {
DECLARE_HVM_SAVE_TYPE(LAPIC_REGS, 6, struct hvm_hw_lapic_regs);
-
/*
* IRQs
*/
@@ -463,7 +458,6 @@ struct hvm_hw_pit {
DECLARE_HVM_SAVE_TYPE(PIT, 10, struct hvm_hw_pit);
-
/*
* RTC
*/
@@ -479,7 +473,6 @@ struct hvm_hw_rtc {
DECLARE_HVM_SAVE_TYPE(RTC, 11, struct hvm_hw_rtc);
-
/*
* HPET
*/
@@ -509,7 +502,6 @@ struct hvm_hw_hpet {
DECLARE_HVM_SAVE_TYPE(HPET, 12, struct hvm_hw_hpet);
-
/*
* PM timer
*/
@@ -593,7 +585,6 @@ struct hvm_tsc_adjust {
};
DECLARE_HVM_SAVE_TYPE(TSC_ADJUST, 19, struct hvm_tsc_adjust);
-
struct hvm_msr {
uint32_t count;
Modified: head/sys/xen/interface/arch-x86/pmu.h
==
--- head/sys/xen/interface/arch-x86/pmu.h Tue Sep 1 21:21:19 2020
(r365076)
+++ head/sys/xen/interface/arch-x86/pmu.h Tue Sep 1 21:21:55 2020
(r365077)
@@ -164,4 +164,3 @@ DEFINE_XEN_GUEST_HANDLE(xen_pmu_arch_t);
* indent-tabs-mode: nil
* End:
*/
-
Modified: head/sys/xen/interface/arch-x86/xen-mca.h
==
--- head/sys/xen/interface/arch-x86/xen-mca.h Tue Sep 1 21:21:19 2020
(r365076)
+++ head/sys/xen/interface/arch-x86/xen-mca.h Tue Sep 1 21:21:55 2020
(r365077)
@@ -88,7 +88,6 @@
#define XEN_MC_NOTDELIVERED 0x10
/* Note, XEN_MC_CANNOTHANDLE and XEN_MC_NOTDELIVERED are mutually exclusive. */
-
#ifndef __ASSEMBLY__
#define VIRQ_MCA VIRQ_ARCH_0 /* G. (DOM0) Machine Check Architecture */
@@ -111,7 +110,6 @@ struct mcinfo_common {
uint16_t size; /* size of this struct in bytes */
};
-
#define MC_FLAG_CORRECTABLE (1 << 0)
#define MC_FLAG_UNCORRECTABLE (1 << 1)
#define MC_FLAG_RECOVERABLE(1 << 2)
@@ -149,7 +147,6 @@ struct mcinfo_bank {
uint64_t mc_tsc;
};
-
struct mcinfo_msr {
uint64_t reg; /* MSR */
uint64_t value; /* MSR value */
@@ -229,7 +226,6 @@ struct mcinfo_recovery
} action_info;
};
-
#define MCINFO_HYPERCALLSIZE 1024
#define MCINFO_MAXSIZE 768
@@ -280,7 +276,6 @@ struct mcinfo_logical_cpu {
typedef struct mcinfo_logical_cpu xen_mc_logical_cpu_t;
DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t);
-
/*
* OS's should use these instead of writing their own lookup function
* each with its own bugs and drawbacks.
@@ -325,7 +320,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t);
(_ret) = found ? _mic : NULL; \
} while (0)
-
/* Usecase 1
* Register machine check trap callback handler
*
svn commit: r365076 - in head/sys/mips: atheros atheros/ar531x beri broadcom cavium cavium/cryptocteon cavium/octe cavium/usb include ingenic malta mediatek mips nlm nlm/dev/net nlm/dev/net/ucore n...
Author: mjg Date: Tue Sep 1 21:21:19 2020 New Revision: 365076 URL: https://svnweb.freebsd.org/changeset/base/365076 Log: mips: clean up empty lines in .c and .h files Modified: head/sys/mips/atheros/apb.c head/sys/mips/atheros/ar531x/apb.c head/sys/mips/atheros/ar531x/ar5312_chip.c head/sys/mips/atheros/ar531x/ar5315_chip.c head/sys/mips/atheros/ar531x/ar5315_cpudef.h head/sys/mips/atheros/ar531x/ar5315_gpio.c head/sys/mips/atheros/ar531x/ar5315_machdep.c head/sys/mips/atheros/ar531x/ar5315_setup.c head/sys/mips/atheros/ar531x/ar5315_wdog.c head/sys/mips/atheros/ar531x/ar5315reg.h head/sys/mips/atheros/ar531x/if_are.c head/sys/mips/atheros/ar531x/if_arereg.h head/sys/mips/atheros/ar71xx_cpudef.h head/sys/mips/atheros/ar71xx_gpio.c head/sys/mips/atheros/ar71xx_ohci.c head/sys/mips/atheros/ar71xx_pci.c head/sys/mips/atheros/ar71xx_pci_bus_space.c head/sys/mips/atheros/ar71xx_setup.c head/sys/mips/atheros/ar71xx_spi.c head/sys/mips/atheros/ar71xx_wdog.c head/sys/mips/atheros/ar724x_pci.c head/sys/mips/atheros/ar933x_chip.c head/sys/mips/atheros/ar934x_chip.c head/sys/mips/atheros/if_arge.c head/sys/mips/atheros/if_argevar.h head/sys/mips/atheros/pcf2123reg.h head/sys/mips/atheros/qca955xreg.h head/sys/mips/atheros/uart_dev_ar933x.c head/sys/mips/beri/beri_iommu.c head/sys/mips/beri/beri_machdep.c head/sys/mips/beri/beri_mp.c head/sys/mips/broadcom/bcm_bmips.c head/sys/mips/broadcom/bcm_bmips_exts.h head/sys/mips/broadcom/bcm_mips.c head/sys/mips/broadcom/bcm_mips74k.c head/sys/mips/broadcom/bcm_mips74kreg.h head/sys/mips/broadcom/bcm_mipsvar.h head/sys/mips/broadcom/bcm_nvram_cfe.c head/sys/mips/broadcom/bcm_pmu.c head/sys/mips/broadcom/bhnd_nexus.c head/sys/mips/broadcom/uart_bus_chipc.c head/sys/mips/cavium/ciu.c head/sys/mips/cavium/cryptocteon/cavium_crypto.c head/sys/mips/cavium/cryptocteon/cryptocteon.c head/sys/mips/cavium/if_octm.c head/sys/mips/cavium/obio.c head/sys/mips/cavium/obiovar.h head/sys/mips/cavium/octe/cavium-ethernet.h head/sys/mips/cavium/octe/ethernet-common.c head/sys/mips/cavium/octe/ethernet-common.h head/sys/mips/cavium/octe/ethernet-defines.h head/sys/mips/cavium/octe/ethernet-headers.h head/sys/mips/cavium/octe/ethernet-mdio.c head/sys/mips/cavium/octe/ethernet-mdio.h head/sys/mips/cavium/octe/ethernet-mem.c head/sys/mips/cavium/octe/ethernet-mem.h head/sys/mips/cavium/octe/ethernet-rgmii.c head/sys/mips/cavium/octe/ethernet-rx.c head/sys/mips/cavium/octe/ethernet-rx.h head/sys/mips/cavium/octe/ethernet-sgmii.c head/sys/mips/cavium/octe/ethernet-spi.c head/sys/mips/cavium/octe/ethernet-tx.c head/sys/mips/cavium/octe/ethernet-tx.h head/sys/mips/cavium/octe/ethernet-util.h head/sys/mips/cavium/octe/ethernet-xaui.c head/sys/mips/cavium/octe/ethernet.c head/sys/mips/cavium/octe/mv88e61xxphy.c head/sys/mips/cavium/octe/octe.c head/sys/mips/cavium/octe/octebus.c head/sys/mips/cavium/octe/wrapper-cvmx-includes.h head/sys/mips/cavium/octeon_ds1337.c head/sys/mips/cavium/octeon_ebt3000_cf.c head/sys/mips/cavium/octeon_gpio.c head/sys/mips/cavium/octeon_machdep.c head/sys/mips/cavium/octeon_rnd.c head/sys/mips/cavium/octeon_rtc.c head/sys/mips/cavium/octopci.c head/sys/mips/cavium/octopci_bus_space.c head/sys/mips/cavium/octopcireg.h head/sys/mips/cavium/uart_dev_oct16550.c head/sys/mips/cavium/usb/octusb.c head/sys/mips/cavium/usb/octusb.h head/sys/mips/cavium/usb/octusb_octeon.c head/sys/mips/include/bus.h head/sys/mips/include/cpufunc.h head/sys/mips/include/cpuregs.h head/sys/mips/include/db_machdep.h head/sys/mips/include/mips_opcode.h head/sys/mips/include/regnum.h head/sys/mips/ingenic/jz4780_clk_gen.c head/sys/mips/ingenic/jz4780_clock.c head/sys/mips/ingenic/jz4780_machdep.c head/sys/mips/ingenic/jz4780_pdma.c head/sys/mips/ingenic/jz4780_pinctrl.c head/sys/mips/ingenic/jz4780_pinctrl.h head/sys/mips/ingenic/jz4780_timer.c head/sys/mips/malta/gt.c head/sys/mips/malta/gt_pci.c head/sys/mips/malta/gtreg.h head/sys/mips/malta/malta_machdep.c head/sys/mips/malta/maltareg.h head/sys/mips/malta/obio.c head/sys/mips/malta/obiovar.h head/sys/mips/mediatek/fdt_reset.c head/sys/mips/mediatek/fdt_reset.h head/sys/mips/mediatek/mtk_gpio_v1.c head/sys/mips/mediatek/mtk_machdep.c head/sys/mips/mediatek/mtk_pcie.c head/sys/mips/mediatek/mtk_pinctrl.h head/sys/mips/mediatek/mtk_spi_v1.c head/sys/mips/mediatek/mtk_spi_v2.c head/sys/mips/mediatek/uart_dev_mtk.c head/sys/mips/mips/busdma_machdep.c head/sys/mips/mips/cache_mipsNN.c head/sys/mips/mips/cpu.c head/sys/mips/mips/db_interface.c head/sys/mips/mips/db_trace.c head/sys/mips/mips/elf_trampoline.c head/sys/mips/mips/gdb_machdep.c head/sys/mips/mips/mips_pic.c head/sys/mips/mips/nexus.c head/sys/mips/mips/pm_machdep.c head/sys/mips/mips/pmap.c head/sys/mips/mips/tick.c
svn commit: r365075 - in head/sys/riscv: include riscv
Author: mjg
Date: Tue Sep 1 21:21:03 2020
New Revision: 365075
URL: https://svnweb.freebsd.org/changeset/base/365075
Log:
riscv: clean up empty lines in .c and .h files
Modified:
head/sys/riscv/include/atomic.h
head/sys/riscv/include/bus.h
head/sys/riscv/riscv/busdma_bounce.c
head/sys/riscv/riscv/identcpu.c
head/sys/riscv/riscv/mem.c
head/sys/riscv/riscv/nexus.c
head/sys/riscv/riscv/pmap.c
head/sys/riscv/riscv/sbi.c
Modified: head/sys/riscv/include/atomic.h
==
--- head/sys/riscv/include/atomic.h Tue Sep 1 21:20:45 2020
(r365074)
+++ head/sys/riscv/include/atomic.h Tue Sep 1 21:21:03 2020
(r365075)
@@ -117,7 +117,6 @@ ATOMIC_FCMPSET_ACQ_REL(16);
#defineatomic_fcmpset_acq_char atomic_fcmpset_acq_8
#defineatomic_fcmpset_rel_char atomic_fcmpset_rel_8
-
#defineatomic_cmpset_short atomic_cmpset_16
#defineatomic_cmpset_acq_short atomic_cmpset_acq_16
#defineatomic_cmpset_rel_short atomic_cmpset_rel_16
Modified: head/sys/riscv/include/bus.h
==
--- head/sys/riscv/include/bus.hTue Sep 1 21:20:45 2020
(r365074)
+++ head/sys/riscv/include/bus.hTue Sep 1 21:21:03 2020
(r365075)
@@ -89,7 +89,6 @@
#defineBUS_SPACE_BARRIER_READ 0x01
#defineBUS_SPACE_BARRIER_WRITE 0x02
-
struct bus_space {
/* cookie */
void*bs_cookie;
@@ -256,7 +255,6 @@ struct bus_space {
bus_size_t, const u_int64_t *, bus_size_t);
};
-
/*
* Utility macros; INTERNAL USE ONLY.
*/
@@ -282,7 +280,6 @@ struct bus_space {
#define__bs_nonsingle_s(type, sz, t, h, o, a, c)
\
(*(t)->__bs_opname_s(type,sz))((t)->bs_cookie, h, o, a, c)
-
/*
* Mapping and unmapping operations.
*/
@@ -293,7 +290,6 @@ struct bus_space {
#definebus_space_subregion(t, h, o, s, hp)
\
(*(t)->bs_subregion)((t)->bs_cookie, (h), (o), (s), (hp))
-
/*
* Allocation and deallocation operations.
*/
@@ -309,8 +305,6 @@ struct bus_space {
#definebus_space_barrier(t, h, o, l, f)
\
(*(t)->bs_barrier)((t)->bs_cookie, (h), (o), (l), (f))
-
-
/*
* Bus read (single) operations.
*/
@@ -345,7 +339,6 @@ struct bus_space {
#definebus_space_read_multi_stream_8(t, h, o, a, c)
\
__bs_nonsingle_s(rm,8,(t),(h),(o),(a),(c))
-
/*
* Bus read region operations.
*/
@@ -367,7 +360,6 @@ struct bus_space {
#definebus_space_read_region_stream_8(t, h, o, a, c)
\
__bs_nonsingle_s(rr,8,(t),(h),(o),(a),(c))
-
/*
* Bus write (single) operations.
*/
@@ -381,7 +373,6 @@ struct bus_space {
#definebus_space_write_stream_4(t, h, o, v)
__bs_ws_s(4,(t),(h),(o),(v))
#definebus_space_write_stream_8(t, h, o, v)
__bs_ws_s(8,(t),(h),(o),(v))
-
/*
* Bus write multiple operations.
*/
@@ -403,7 +394,6 @@ struct bus_space {
#definebus_space_write_multi_stream_8(t, h, o, a, c)
\
__bs_nonsingle_s(wm,8,(t),(h),(o),(a),(c))
-
/*
* Bus write region operations.
*/
@@ -425,7 +415,6 @@ struct bus_space {
#definebus_space_write_region_stream_8(t, h, o, a, c)
\
__bs_nonsingle_s(wr,8,(t),(h),(o),(a),(c))
-
/*
* Set multiple operations.
*/
@@ -438,7 +427,6 @@ struct bus_space {
#definebus_space_set_multi_8(t, h, o, v, c)
\
__bs_set(sm,8,(t),(h),(o),(v),(c))
-
/*
* Set region operations.
*/
@@ -450,7 +438,6 @@ struct bus_space {
__bs_set(sr,4,(t),(h),(o),(v),(c))
#definebus_space_set_region_8(t, h, o, v, c)
\
__bs_set(sr,8,(t),(h),(o),(v),(c))
-
/*
* Copy operations.
Modified: head/sys/riscv/riscv/busdma_bounce.c
==
--- head/sys/riscv/riscv/busdma_bounce.cTue Sep 1 21:20:45 2020
(r365074)
+++ head/sys/riscv/riscv/busdma_bounce.cTue Sep 1 21:21:03 2020
(r365075)
@@ -400,7 +400,6 @@ bounce_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmam
return (0);
}
-
/*
* Allocate a piece of memory that can be efficiently mapped into
* bus device space based on the constraints lited in the dma tag.
@@ -813,7 +812,6 @@ bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_
if (map->sync_count == 0 ||
(kvaddr != 0 && kvaddr != sl_vend) ||
(curaddr != sl_pend)) {
-
if (++map->sync_count > dmat->common.nsegments)
goto cleanup;
svn commit: r365074 - head/sys/vm
Author: mjg
Date: Tue Sep 1 21:20:45 2020
New Revision: 365074
URL: https://svnweb.freebsd.org/changeset/base/365074
Log:
vm: clean up empty lines in .c and .h files
Modified:
head/sys/vm/default_pager.c
head/sys/vm/memguard.c
head/sys/vm/redzone.c
head/sys/vm/sg_pager.c
head/sys/vm/swap_pager.c
head/sys/vm/uma.h
head/sys/vm/uma_core.c
head/sys/vm/uma_int.h
head/sys/vm/vm.h
head/sys/vm/vm_fault.c
head/sys/vm/vm_map.c
head/sys/vm/vm_meter.c
head/sys/vm/vm_mmap.c
head/sys/vm/vm_object.c
head/sys/vm/vm_pager.h
head/sys/vm/vm_phys.h
head/sys/vm/vm_radix.c
head/sys/vm/vnode_pager.c
Modified: head/sys/vm/default_pager.c
==
--- head/sys/vm/default_pager.c Tue Sep 1 21:20:08 2020(r365073)
+++ head/sys/vm/default_pager.c Tue Sep 1 21:20:45 2020(r365074)
@@ -154,4 +154,3 @@ default_pager_haspage(vm_object_t object, vm_pindex_t
/* An OBJT_DEFAULT object has no backing store. */
return (FALSE);
}
-
Modified: head/sys/vm/memguard.c
==
--- head/sys/vm/memguard.c Tue Sep 1 21:20:08 2020(r365073)
+++ head/sys/vm/memguard.c Tue Sep 1 21:20:45 2020(r365074)
@@ -158,7 +158,6 @@ SYSCTL_UINT(_vm_memguard, OID_AUTO, frequency, CTLFLAG
SYSCTL_ULONG(_vm_memguard, OID_AUTO, frequency_hits, CTLFLAG_RD,
_frequency_hits, 0, "# times MemGuard randomly chose");
-
/*
* Return a fudged value to be used for vm_kmem_size for allocating
* the kernel_arena.
Modified: head/sys/vm/redzone.c
==
--- head/sys/vm/redzone.c Tue Sep 1 21:20:08 2020(r365073)
+++ head/sys/vm/redzone.c Tue Sep 1 21:20:45 2020(r365074)
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
#include
-
static SYSCTL_NODE(_vm, OID_AUTO, redzone, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL,
"RedZone data");
static u_long redzone_extra_mem = 0;
Modified: head/sys/vm/sg_pager.c
==
--- head/sys/vm/sg_pager.c Tue Sep 1 21:20:08 2020(r365073)
+++ head/sys/vm/sg_pager.c Tue Sep 1 21:20:45 2020(r365074)
@@ -134,7 +134,7 @@ sg_pager_dealloc(vm_object_t object)
TAILQ_REMOVE(>un_pager.sgp.sgp_pglist, m, plinks.q);
vm_page_putfake(m);
}
-
+
sg = object->handle;
sglist_free(sg);
object->handle = NULL;
Modified: head/sys/vm/swap_pager.c
==
--- head/sys/vm/swap_pager.cTue Sep 1 21:20:08 2020(r365073)
+++ head/sys/vm/swap_pager.cTue Sep 1 21:20:45 2020(r365074)
@@ -865,7 +865,6 @@ swp_pager_strategy(struct buf *bp)
panic("Swapdev not found");
}
-
/*
* SWP_PAGER_FREESWAPSPACE() - free raw swap space
*
@@ -2744,7 +2743,6 @@ static struct g_class g_swap_class = {
DECLARE_GEOM_CLASS(g_swap_class, g_class);
-
static void
swapgeom_close_ev(void *arg, int flags)
{
@@ -3007,7 +3005,6 @@ swapdev_close(struct thread *td, struct swdevt *sp)
VOP_CLOSE(sp->sw_vp, FREAD | FWRITE, td->td_ucred, td);
vrele(sp->sw_vp);
}
-
static int
swaponvp(struct thread *td, struct vnode *vp, u_long nblks)
Modified: head/sys/vm/uma.h
==
--- head/sys/vm/uma.h Tue Sep 1 21:20:08 2020(r365073)
+++ head/sys/vm/uma.h Tue Sep 1 21:20:45 2020(r365074)
@@ -154,7 +154,6 @@ typedef void (*uma_release)(void *arg, void **store, i
*
*/
-
/* Function proto types */
/*
Modified: head/sys/vm/uma_core.c
==
--- head/sys/vm/uma_core.c Tue Sep 1 21:20:08 2020(r365073)
+++ head/sys/vm/uma_core.c Tue Sep 1 21:20:45 2020(r365074)
@@ -1892,7 +1892,6 @@ pcpu_page_free(void *mem, vm_size_t size, uint8_t flag
kva_free(sva, size);
}
-
/*
* Zero fill initializer
*
@@ -4975,7 +4974,6 @@ uma_vm_zone_stats(struct uma_type_header *uth, uma_zon
uma_zone_domain_t zdom;
uma_cache_t cache;
int i;
-
for (i = 0; i < vm_ndomains; i++) {
zdom = ZDOM_GET(z, i);
Modified: head/sys/vm/uma_int.h
==
--- head/sys/vm/uma_int.h Tue Sep 1 21:20:08 2020(r365073)
+++ head/sys/vm/uma_int.h Tue Sep 1 21:20:45 2020(r365074)
@@ -307,14 +307,14 @@ cache_uz_flags(uma_cache_t cache)
return (cache->uc_freebucket.ucb_spare);
}
-
+
static inline uint32_t
cache_uz_size(uma_cache_t cache)
{
return (cache->uc_allocbucket.ucb_spare);
}
-
+
/*
* Per-domain slab lists. Embedded in the kegs.
*/
svn commit: r365073 - in head/sys/powerpc: aim amigaone booke cpufreq fpu include mambo mikrotik mpc85xx ofw powermac powernv powerpc ps3 pseries psim
Author: mjg Date: Tue Sep 1 21:20:08 2020 New Revision: 365073 URL: https://svnweb.freebsd.org/changeset/base/365073 Log: powerpc: clean up empty lines in .c and .h files Modified: head/sys/powerpc/aim/aim_machdep.c head/sys/powerpc/aim/mmu_oea.c head/sys/powerpc/aim/mmu_oea64.c head/sys/powerpc/aim/mmu_oea64.h head/sys/powerpc/aim/mmu_radix.c head/sys/powerpc/aim/moea64_native.c head/sys/powerpc/aim/mp_cpudep.c head/sys/powerpc/aim/slb.c head/sys/powerpc/amigaone/cpld_a1222.c head/sys/powerpc/amigaone/cpld_x5000.c head/sys/powerpc/booke/booke_machdep.c head/sys/powerpc/booke/platform_bare.c head/sys/powerpc/booke/pmap.c head/sys/powerpc/booke/pmap_32.c head/sys/powerpc/booke/pmap_64.c head/sys/powerpc/booke/spe.c head/sys/powerpc/cpufreq/dfs.c head/sys/powerpc/cpufreq/mpc85xx_jog.c head/sys/powerpc/cpufreq/pcr.c head/sys/powerpc/cpufreq/pmcr.c head/sys/powerpc/cpufreq/pmufreq.c head/sys/powerpc/fpu/fpu_arith.h head/sys/powerpc/fpu/fpu_emu.c head/sys/powerpc/fpu/fpu_explode.c head/sys/powerpc/fpu/fpu_extern.h head/sys/powerpc/fpu/fpu_implode.c head/sys/powerpc/fpu/fpu_instr.h head/sys/powerpc/include/altivec.h head/sys/powerpc/include/atomic.h head/sys/powerpc/include/bat.h head/sys/powerpc/include/cpufunc.h head/sys/powerpc/include/mmuvar.h head/sys/powerpc/include/openpicreg.h head/sys/powerpc/include/openpicvar.h head/sys/powerpc/include/pcb.h head/sys/powerpc/include/pio.h head/sys/powerpc/include/pmap.h head/sys/powerpc/include/rtas.h head/sys/powerpc/include/spr.h head/sys/powerpc/include/trap.h head/sys/powerpc/mambo/mambo.c head/sys/powerpc/mikrotik/rb_led.c head/sys/powerpc/mpc85xx/atpic.c head/sys/powerpc/mpc85xx/ds1553_bus_fdt.c head/sys/powerpc/mpc85xx/ds1553_reg.h head/sys/powerpc/mpc85xx/fsl_diu.c head/sys/powerpc/mpc85xx/fsl_sata.c head/sys/powerpc/mpc85xx/fsl_sata.h head/sys/powerpc/mpc85xx/i2c.c head/sys/powerpc/mpc85xx/lbc.c head/sys/powerpc/mpc85xx/mpc85xx.c head/sys/powerpc/mpc85xx/mpc85xx_gpio.c head/sys/powerpc/mpc85xx/pci_mpc85xx.c head/sys/powerpc/mpc85xx/platform_mpc85xx.c head/sys/powerpc/mpc85xx/qoriq_gpio.c head/sys/powerpc/ofw/ofw_initrd.c head/sys/powerpc/ofw/ofw_machdep.c head/sys/powerpc/ofw/ofw_pcib_pci.c head/sys/powerpc/ofw/ofw_pcibus.c head/sys/powerpc/ofw/ofw_pcibus.h head/sys/powerpc/ofw/ofw_real.c head/sys/powerpc/ofw/ofw_syscons.c head/sys/powerpc/ofw/openpic_ofw.c head/sys/powerpc/ofw/rtas.c head/sys/powerpc/powermac/ata_dbdma.c head/sys/powerpc/powermac/ata_dbdma.h head/sys/powerpc/powermac/ata_macio.c head/sys/powerpc/powermac/cpcht.c head/sys/powerpc/powermac/cuda.c head/sys/powerpc/powermac/dbdma.c head/sys/powerpc/powermac/dbdmavar.h head/sys/powerpc/powermac/grackle.c head/sys/powerpc/powermac/kiic.c head/sys/powerpc/powermac/macgpio.c head/sys/powerpc/powermac/macio.c head/sys/powerpc/powermac/nvbl.c head/sys/powerpc/powermac/platform_powermac.c head/sys/powerpc/powermac/pmu.c head/sys/powerpc/powermac/pmuvar.h head/sys/powerpc/powermac/powermac_thermal.c head/sys/powerpc/powermac/powermac_thermal.h head/sys/powerpc/powermac/pswitch.c head/sys/powerpc/powermac/smu.c head/sys/powerpc/powermac/smusat.c head/sys/powerpc/powermac/uninorth.c head/sys/powerpc/powermac/uninorthpci.c head/sys/powerpc/powermac/uninorthvar.h head/sys/powerpc/powermac/vcoregpio.c head/sys/powerpc/powernv/opal.c head/sys/powerpc/powernv/opal_console.c head/sys/powerpc/powernv/opal_dev.c head/sys/powerpc/powernv/opal_flash.c head/sys/powerpc/powernv/opal_i2cm.c head/sys/powerpc/powernv/opal_nvram.c head/sys/powerpc/powernv/opal_pci.c head/sys/powerpc/powernv/opal_sensor.c head/sys/powerpc/powernv/platform_powernv.c head/sys/powerpc/powernv/powernv_centaur.c head/sys/powerpc/powernv/powernv_xscom.c head/sys/powerpc/powernv/xive.c head/sys/powerpc/powerpc/bus_machdep.c head/sys/powerpc/powerpc/busdma_machdep.c head/sys/powerpc/powerpc/clock.c head/sys/powerpc/powerpc/copyinout.c head/sys/powerpc/powerpc/cpu.c head/sys/powerpc/powerpc/db_disasm.c head/sys/powerpc/powerpc/db_interface.c head/sys/powerpc/powerpc/db_trace.c head/sys/powerpc/powerpc/elf32_machdep.c head/sys/powerpc/powerpc/elf64_machdep.c head/sys/powerpc/powerpc/exec_machdep.c head/sys/powerpc/powerpc/genassym.c head/sys/powerpc/powerpc/intr_machdep.c head/sys/powerpc/powerpc/mem.c head/sys/powerpc/powerpc/minidump_machdep.c head/sys/powerpc/powerpc/mp_machdep.c head/sys/powerpc/powerpc/nexus.c head/sys/powerpc/powerpc/platform.c head/sys/powerpc/powerpc/syncicache.c head/sys/powerpc/powerpc/sys_machdep.c head/sys/powerpc/powerpc/trap.c head/sys/powerpc/powerpc/uma_machdep.c head/sys/powerpc/ps3/if_glc.c head/sys/powerpc/ps3/if_glcreg.h head/sys/powerpc/ps3/mmu_ps3.c head/sys/powerpc/ps3/ohci_ps3.c head/sys/powerpc/ps3/platform_ps3.c head/sys/powerpc/ps3/ps3_syscons.c
svn commit: r365072 - in head/sys/i386: acpica bios i386 include include/xen linux pci
Author: mjg
Date: Tue Sep 1 21:19:39 2020
New Revision: 365072
URL: https://svnweb.freebsd.org/changeset/base/365072
Log:
i386: clean up empty lines in .c and .h files
Modified:
head/sys/i386/acpica/acpi_machdep.c
head/sys/i386/bios/apm.c
head/sys/i386/i386/bios.c
head/sys/i386/i386/db_disasm.c
head/sys/i386/i386/db_trace.c
head/sys/i386/i386/elan-mmcr.c
head/sys/i386/i386/elf_machdep.c
head/sys/i386/i386/geode.c
head/sys/i386/i386/initcpu.c
head/sys/i386/i386/machdep.c
head/sys/i386/i386/mem.c
head/sys/i386/i386/minidump_machdep.c
head/sys/i386/i386/mp_clock.c
head/sys/i386/i386/mp_machdep.c
head/sys/i386/i386/npx.c
head/sys/i386/i386/pmap.c
head/sys/i386/i386/pmap_base.c
head/sys/i386/i386/sys_machdep.c
head/sys/i386/i386/vm86.c
head/sys/i386/include/asmacros.h
head/sys/i386/include/if_wl_wavelan.h
head/sys/i386/include/param.h
head/sys/i386/include/perfmon.h
head/sys/i386/include/pmap.h
head/sys/i386/include/smapi.h
head/sys/i386/include/vmparam.h
head/sys/i386/include/xen/hypercall.h
head/sys/i386/include/xen/synch_bitops.h
head/sys/i386/linux/linux.h
head/sys/i386/linux/linux_machdep.c
head/sys/i386/linux/linux_proto.h
head/sys/i386/linux/linux_sysvec.c
head/sys/i386/pci/pci_cfgreg.c
head/sys/i386/pci/pci_pir.c
Modified: head/sys/i386/acpica/acpi_machdep.c
==
--- head/sys/i386/acpica/acpi_machdep.c Tue Sep 1 21:19:14 2020
(r365071)
+++ head/sys/i386/acpica/acpi_machdep.c Tue Sep 1 21:19:39 2020
(r365072)
@@ -300,7 +300,6 @@ static device_method_t nexus_acpi_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, nexus_acpi_probe),
DEVMETHOD(device_attach,nexus_acpi_attach),
-
{ 0, 0 }
};
Modified: head/sys/i386/bios/apm.c
==
--- head/sys/i386/bios/apm.cTue Sep 1 21:19:14 2020(r365071)
+++ head/sys/i386/bios/apm.cTue Sep 1 21:19:39 2020(r365072)
@@ -397,7 +397,6 @@ deleteit:
*list = p->ah_next;
}
-
/* APM driver calls some functions automatically */
static void
apm_execute_hook(struct apmhook *list)
@@ -411,7 +410,6 @@ apm_execute_hook(struct apmhook *list)
}
}
-
/* establish an apm hook */
struct apmhook *
apm_hook_establish(int apmh, struct apmhook *ah)
@@ -583,7 +581,6 @@ apm_resume(void)
EVENTHANDLER_INVOKE(power_resume);
}
-
/* get power status per battery */
static int
apm_get_pwstatus(apm_pwstatus_t app)
@@ -619,7 +616,6 @@ apm_get_pwstatus(apm_pwstatus_t app)
return 0;
}
-
/* get APM information */
static int
apm_get_info(apm_info_t aip)
@@ -658,7 +654,6 @@ apm_get_info(apm_info_t aip)
return 0;
}
-
/* inform APM BIOS that CPU is idle */
void
apm_cpu_idle(void)
@@ -666,7 +661,6 @@ apm_cpu_idle(void)
struct apm_softc *sc = _softc;
if (sc->active) {
-
sc->bios.r.eax = (APM_BIOS <<8) | APM_CPUIDLE;
sc->bios.r.edx = sc->bios.r.ecx = sc->bios.r.ebx = 0;
(void) apm_bioscall();
@@ -697,14 +691,12 @@ apm_cpu_busy(void)
* necessary.
*/
if (sc->slow_idle_cpu && sc->active) {
-
sc->bios.r.eax = (APM_BIOS <<8) | APM_CPUBUSY;
sc->bios.r.edx = sc->bios.r.ecx = sc->bios.r.ebx = 0;
apm_bioscall();
}
}
-
/*
* APM thread loop.
*
@@ -935,7 +927,6 @@ apm_probe(device_t dev)
return(0);
}
-
/*
* return 0 if the user will notice and handle the event,
* return 1 if the kernel driver should do so.
@@ -1171,7 +1162,6 @@ apm_attach(device_t dev)
((apm_version & 0x00f0) >> 4) * 10 + ((apm_version & 0x000f) >>
0),
sc->majorversion, sc->minorversion);
-
APM_DPRINT("apm: Slow Idling CPU %s\n", is_enabled(sc->slow_idle_cpu));
/* enable power management */
if (sc->disabled) {
@@ -1472,7 +1462,6 @@ static device_method_t apm_methods[] = {
DEVMETHOD(device_identify, apm_identify),
DEVMETHOD(device_probe, apm_probe),
DEVMETHOD(device_attach,apm_attach),
-
{ 0, 0 }
};
Modified: head/sys/i386/i386/bios.c
==
--- head/sys/i386/i386/bios.c Tue Sep 1 21:19:14 2020(r365071)
+++ head/sys/i386/i386/bios.c Tue Sep 1 21:19:39 2020(r365072)
@@ -91,7 +91,6 @@ bios32_init(void *junk)
/* look for the signature */
if ((sigaddr = bios_sigsearch(0, "_32_", 4, 16, 0)) != 0) {
-
/* get a virtual pointer to the structure */
sdh = (struct bios32_SDheader *)(uintptr_t)BIOS_PADDRTOVADDR(sigaddr);
for (cv = (u_int8_t *)sdh, ck = 0, i = 0; i < (sdh->len * 16); i++) {
@@ -109,7 +108,6 @@ bios32_init(void *junk)
/* Allow user
svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph...
Author: mjg Date: Tue Sep 1 21:19:14 2020 New Revision: 365071 URL: https://svnweb.freebsd.org/changeset/base/365071 Log: net: clean up empty lines in .c and .h files Modified: head/sys/net/altq/altq.h head/sys/net/altq/altq_cbq.c head/sys/net/altq/altq_cbq.h head/sys/net/altq/altq_codel.c head/sys/net/altq/altq_fairq.c head/sys/net/altq/altq_hfsc.c head/sys/net/altq/altq_hfsc.h head/sys/net/altq/altq_priq.c head/sys/net/altq/altq_priq.h head/sys/net/altq/altq_red.c head/sys/net/altq/altq_red.h head/sys/net/altq/altq_rio.c head/sys/net/altq/altq_rio.h head/sys/net/altq/altq_rmclass.c head/sys/net/altq/altq_subr.c head/sys/net/altq/if_altq.h head/sys/net/bpf.c head/sys/net/bridgestp.c head/sys/net/bridgestp.h head/sys/net/debugnet_inet.c head/sys/net/ieee8023ad_lacp.c head/sys/net/if.c head/sys/net/if.h head/sys/net/if_bridge.c head/sys/net/if_clone.c head/sys/net/if_dl.h head/sys/net/if_epair.c head/sys/net/if_ethersubr.c head/sys/net/if_gif.c head/sys/net/if_ipsec.c head/sys/net/if_lagg.c head/sys/net/if_llatbl.c head/sys/net/if_loop.c head/sys/net/if_media.c head/sys/net/if_media.h head/sys/net/if_mib.c head/sys/net/if_pfsync.h head/sys/net/if_spppsubr.c head/sys/net/if_tuntap.c head/sys/net/if_vlan.c head/sys/net/iflib.c head/sys/net/iflib.h head/sys/net/iflib_clone.c head/sys/net/ifq.h head/sys/net/mp_ring.c head/sys/net/netisr.c head/sys/net/netmap.h head/sys/net/netmap_legacy.h head/sys/net/netmap_user.h head/sys/net/pfvar.h head/sys/net/radix.c head/sys/net/radix_mpath.c head/sys/net/route.c head/sys/net/route/nhop.c head/sys/net/route/nhop.h head/sys/net/route/nhop_ctl.c head/sys/net/route/nhop_utils.c head/sys/net/route/nhop_utils.h head/sys/net/route/nhop_var.h head/sys/net/route/route_ctl.c head/sys/net/route/route_ctl.h head/sys/net/route/route_helpers.c head/sys/net/route/route_tables.c head/sys/net/route/route_temporal.c head/sys/net/route/route_var.h head/sys/net/rss_config.c head/sys/net/rtsock.c head/sys/net/sff8436.h head/sys/net/sff8472.h head/sys/net/slcompress.c head/sys/net/slcompress.h head/sys/net/vnet.h head/sys/net80211/ieee80211.h head/sys/net80211/ieee80211_action.c head/sys/net80211/ieee80211_ageq.c head/sys/net80211/ieee80211_crypto.c head/sys/net80211/ieee80211_crypto_tkip.c head/sys/net80211/ieee80211_freebsd.c head/sys/net80211/ieee80211_freebsd.h head/sys/net80211/ieee80211_hostap.c head/sys/net80211/ieee80211_ht.c head/sys/net80211/ieee80211_hwmp.c head/sys/net80211/ieee80211_input.c head/sys/net80211/ieee80211_ioctl.c head/sys/net80211/ieee80211_ioctl.h head/sys/net80211/ieee80211_mesh.c head/sys/net80211/ieee80211_mesh.h head/sys/net80211/ieee80211_node.c head/sys/net80211/ieee80211_output.c head/sys/net80211/ieee80211_phy.c head/sys/net80211/ieee80211_power.c head/sys/net80211/ieee80211_proto.c head/sys/net80211/ieee80211_radiotap.c head/sys/net80211/ieee80211_radiotap.h head/sys/net80211/ieee80211_scan.c head/sys/net80211/ieee80211_scan_sta.c head/sys/net80211/ieee80211_scan_sw.c head/sys/net80211/ieee80211_sta.c head/sys/net80211/ieee80211_superg.c head/sys/net80211/ieee80211_tdma.h head/sys/net80211/ieee80211_vht.c head/sys/netgraph/atm/ccatm/ng_ccatm.c head/sys/netgraph/atm/ng_sscop.h head/sys/netgraph/atm/ngatmbase.c head/sys/netgraph/atm/sscfu/ng_sscfu.c head/sys/netgraph/atm/sscfu/ng_sscfu_cust.h head/sys/netgraph/atm/sscop/ng_sscop.c head/sys/netgraph/atm/sscop/ng_sscop_cust.h head/sys/netgraph/atm/uni/ng_uni.c head/sys/netgraph/bluetooth/common/ng_bluetooth.c head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h head/sys/netgraph/bluetooth/drivers/h4/ng_h4.c head/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h head/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c head/sys/netgraph/bluetooth/hci/ng_hci_cmds.c head/sys/netgraph/bluetooth/hci/ng_hci_cmds.h head/sys/netgraph/bluetooth/hci/ng_hci_evnt.c head/sys/netgraph/bluetooth/hci/ng_hci_evnt.h head/sys/netgraph/bluetooth/hci/ng_hci_main.c head/sys/netgraph/bluetooth/hci/ng_hci_misc.c head/sys/netgraph/bluetooth/hci/ng_hci_misc.h head/sys/netgraph/bluetooth/hci/ng_hci_prse.h head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h head/sys/netgraph/bluetooth/hci/ng_hci_var.h head/sys/netgraph/bluetooth/include/ng_bluetooth.h head/sys/netgraph/bluetooth/include/ng_bt3c.h head/sys/netgraph/bluetooth/include/ng_btsocket.h head/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h head/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h head/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
svn commit: r365070 - in head/sys/fs: autofs cd9660 cuse devfs ext2fs fdescfs fifofs fuse msdosfs nfs nfsclient nfsserver nullfs procfs smbfs tmpfs udf unionfs
Author: mjg
Date: Tue Sep 1 21:18:40 2020
New Revision: 365070
URL: https://svnweb.freebsd.org/changeset/base/365070
Log:
fs: clean up empty lines in .c and .h files
Modified:
head/sys/fs/autofs/autofs.c
head/sys/fs/autofs/autofs_vnops.c
head/sys/fs/cd9660/cd9660_node.h
head/sys/fs/cd9660/cd9660_rrip.c
head/sys/fs/cd9660/cd9660_vnops.c
head/sys/fs/cd9660/iso_rrip.h
head/sys/fs/cuse/cuse.c
head/sys/fs/devfs/devfs_devs.c
head/sys/fs/ext2fs/ext2_alloc.c
head/sys/fs/ext2fs/ext2_balloc.c
head/sys/fs/ext2fs/ext2_bmap.c
head/sys/fs/ext2fs/ext2_dinode.h
head/sys/fs/ext2fs/ext2_extattr.c
head/sys/fs/ext2fs/ext2_extattr.h
head/sys/fs/ext2fs/ext2_extents.c
head/sys/fs/ext2fs/ext2_inode_cnv.c
head/sys/fs/ext2fs/ext2_lookup.c
head/sys/fs/ext2fs/ext2_vfsops.c
head/sys/fs/ext2fs/ext2_vnops.c
head/sys/fs/fdescfs/fdesc_vnops.c
head/sys/fs/fifofs/fifo_vnops.c
head/sys/fs/fuse/fuse_internal.c
head/sys/fs/fuse/fuse_internal.h
head/sys/fs/fuse/fuse_io.c
head/sys/fs/fuse/fuse_ipc.c
head/sys/fs/fuse/fuse_kernel.h
head/sys/fs/fuse/fuse_node.c
head/sys/fs/fuse/fuse_vnops.c
head/sys/fs/msdosfs/msdosfs_conv.c
head/sys/fs/msdosfs/msdosfs_fat.c
head/sys/fs/msdosfs/msdosfsmount.h
head/sys/fs/nfs/nfs.h
head/sys/fs/nfs/nfs_commonkrpc.c
head/sys/fs/nfs/nfs_commonport.c
head/sys/fs/nfs/nfs_commonsubs.c
head/sys/fs/nfs/nfs_var.h
head/sys/fs/nfs/nfsdport.h
head/sys/fs/nfs/nfsm_subs.h
head/sys/fs/nfs/nfsproto.h
head/sys/fs/nfs/rpcv2.h
head/sys/fs/nfsclient/nfs_clbio.c
head/sys/fs/nfsclient/nfs_clcomsubs.c
head/sys/fs/nfsclient/nfs_clkdtrace.c
head/sys/fs/nfsclient/nfs_clkrpc.c
head/sys/fs/nfsclient/nfs_clnode.c
head/sys/fs/nfsclient/nfs_clport.c
head/sys/fs/nfsclient/nfs_clrpcops.c
head/sys/fs/nfsclient/nfs_clstate.c
head/sys/fs/nfsclient/nfs_clsubs.c
head/sys/fs/nfsclient/nfs_clvfsops.c
head/sys/fs/nfsclient/nfs_clvnops.c
head/sys/fs/nfsclient/nfs_kdtrace.h
head/sys/fs/nfsserver/nfs_fha_new.c
head/sys/fs/nfsserver/nfs_nfsdcache.c
head/sys/fs/nfsserver/nfs_nfsdkrpc.c
head/sys/fs/nfsserver/nfs_nfsdport.c
head/sys/fs/nfsserver/nfs_nfsdserv.c
head/sys/fs/nfsserver/nfs_nfsdsocket.c
head/sys/fs/nfsserver/nfs_nfsdstate.c
head/sys/fs/nfsserver/nfs_nfsdsubs.c
head/sys/fs/nullfs/null_vnops.c
head/sys/fs/procfs/procfs.c
head/sys/fs/procfs/procfs_rlimit.c
head/sys/fs/smbfs/smbfs.h
head/sys/fs/smbfs/smbfs_io.c
head/sys/fs/smbfs/smbfs_node.c
head/sys/fs/smbfs/smbfs_smb.c
head/sys/fs/smbfs/smbfs_vfsops.c
head/sys/fs/smbfs/smbfs_vnops.c
head/sys/fs/tmpfs/tmpfs_subr.c
head/sys/fs/tmpfs/tmpfs_vnops.c
head/sys/fs/udf/udf_vfsops.c
head/sys/fs/udf/udf_vnops.c
head/sys/fs/unionfs/union_vfsops.c
Modified: head/sys/fs/autofs/autofs.c
==
--- head/sys/fs/autofs/autofs.c Tue Sep 1 21:18:06 2020(r365069)
+++ head/sys/fs/autofs/autofs.c Tue Sep 1 21:18:40 2020(r365070)
@@ -535,7 +535,6 @@ autofs_trigger(struct autofs_node *anp,
"error %d", anp->an_retries, error);
anp->an_retries = 0;
return (error);
-
}
AUTOFS_DEBUG("trigger failed with error %d; will retry in "
"%d seconds, %d attempts left", error, autofs_retry_delay,
Modified: head/sys/fs/autofs/autofs_vnops.c
==
--- head/sys/fs/autofs/autofs_vnops.c Tue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/autofs/autofs_vnops.c Tue Sep 1 21:18:40 2020
(r365070)
@@ -204,7 +204,6 @@ autofs_vget_callback(struct mount *mp, void *arg, int
struct vnode **vpp)
{
-
return (autofs_node_vn(arg, mp, flags, vpp));
}
Modified: head/sys/fs/cd9660/cd9660_node.h
==
--- head/sys/fs/cd9660/cd9660_node.hTue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/cd9660/cd9660_node.hTue Sep 1 21:18:40 2020
(r365070)
@@ -57,7 +57,6 @@ typedef struct {
dev_t iso_rdev; /* Major/Minor number for special */
} ISO_RRIP_INODE;
-
struct iso_node {
struct vnode *i_vnode; /* vnode associated with this inode */
cd_ino_ti_number; /* the identity of the inode */
Modified: head/sys/fs/cd9660/cd9660_rrip.c
==
--- head/sys/fs/cd9660/cd9660_rrip.cTue Sep 1 21:18:06 2020
(r365069)
+++ head/sys/fs/cd9660/cd9660_rrip.cTue Sep 1 21:18:40 2020
(r365070)
@@ -135,7 +135,6 @@ cd9660_rrip_slink(p,ana)
pcomp < pcompe;
pcomp = (ISO_RRIP_SLINK_COMPONENT *)((char *)pcomp + ISO_RRIP_SLSIZ
+ isonum_711(pcomp->clen))) {
-
if (!cont) {
svn commit: r365069 - in head/sys/arm64: arm64 broadcom/genet cavium coresight freescale/imx freescale/imx/clk include linux qoriq qoriq/clk rockchip rockchip/clk
Author: mjg
Date: Tue Sep 1 21:18:06 2020
New Revision: 365069
URL: https://svnweb.freebsd.org/changeset/base/365069
Log:
arm64: clean up empty lines in .c and .h files
Modified:
head/sys/arm64/arm64/busdma_bounce.c
head/sys/arm64/arm64/freebsd32_machdep.c
head/sys/arm64/arm64/gic_v3_acpi.c
head/sys/arm64/arm64/gic_v3_var.h
head/sys/arm64/arm64/gicv3_its.c
head/sys/arm64/arm64/identcpu.c
head/sys/arm64/arm64/machdep.c
head/sys/arm64/arm64/machdep_boot.c
head/sys/arm64/arm64/nexus.c
head/sys/arm64/arm64/pmap.c
head/sys/arm64/arm64/sys_machdep.c
head/sys/arm64/arm64/vfp.c
head/sys/arm64/broadcom/genet/if_genet.c
head/sys/arm64/cavium/thunder_pcie_common.c
head/sys/arm64/cavium/thunder_pcie_fdt.c
head/sys/arm64/cavium/thunder_pcie_pem.c
head/sys/arm64/coresight/coresight_etm4x.c
head/sys/arm64/coresight/coresight_fdt.c
head/sys/arm64/freescale/imx/clk/imx_clk_mux.c
head/sys/arm64/freescale/imx/imx7gpc.c
head/sys/arm64/freescale/imx/imx8mq_ccm.c
head/sys/arm64/include/acpica_machdep.h
head/sys/arm64/include/armreg.h
head/sys/arm64/include/bus.h
head/sys/arm64/include/cpu.h
head/sys/arm64/include/endian.h
head/sys/arm64/include/ieeefp.h
head/sys/arm64/include/ucontext.h
head/sys/arm64/include/vfp.h
head/sys/arm64/linux/linux_proto.h
head/sys/arm64/qoriq/clk/qoriq_clk_pll.h
head/sys/arm64/qoriq/ls1046_gpio.c
head/sys/arm64/rockchip/clk/rk3399_cru.c
head/sys/arm64/rockchip/clk/rk3399_pmucru.c
head/sys/arm64/rockchip/clk/rk_clk_fract.c
head/sys/arm64/rockchip/clk/rk_clk_mux.c
head/sys/arm64/rockchip/rk805reg.h
head/sys/arm64/rockchip/rk_dwc3.c
head/sys/arm64/rockchip/rk_i2c.c
head/sys/arm64/rockchip/rk_pcie.c
head/sys/arm64/rockchip/rk_pcie_phy.c
head/sys/arm64/rockchip/rk_pinctrl.c
head/sys/arm64/rockchip/rk_tsadc.c
Modified: head/sys/arm64/arm64/busdma_bounce.c
==
--- head/sys/arm64/arm64/busdma_bounce.cTue Sep 1 21:17:24 2020
(r365068)
+++ head/sys/arm64/arm64/busdma_bounce.cTue Sep 1 21:18:06 2020
(r365069)
@@ -411,7 +411,6 @@ bounce_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmam
return (0);
}
-
/*
* Allocate a piece of memory that can be efficiently mapped into
* bus device space based on the constraints lited in the dma tag.
@@ -840,7 +839,6 @@ bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_
if (map->sync_count == 0 ||
(kvaddr != 0 && kvaddr != sl_vend) ||
(curaddr != sl_pend)) {
-
if (++map->sync_count > dmat->common.nsegments)
goto cleanup;
sl++;
Modified: head/sys/arm64/arm64/freebsd32_machdep.c
==
--- head/sys/arm64/arm64/freebsd32_machdep.cTue Sep 1 21:17:24 2020
(r365068)
+++ head/sys/arm64/arm64/freebsd32_machdep.cTue Sep 1 21:18:06 2020
(r365069)
@@ -116,8 +116,6 @@ freebsd32_sysarch(struct thread *td, struct freebsd32_
return (EINVAL);
}
-
-
#ifdef VFP
static void
get_fpcontext32(struct thread *td, mcontext32_vfp_t *mcp)
Modified: head/sys/arm64/arm64/gic_v3_acpi.c
==
--- head/sys/arm64/arm64/gic_v3_acpi.c Tue Sep 1 21:17:24 2020
(r365068)
+++ head/sys/arm64/arm64/gic_v3_acpi.c Tue Sep 1 21:18:06 2020
(r365069)
@@ -83,7 +83,6 @@ static devclass_t gic_v3_acpi_devclass;
EARLY_DRIVER_MODULE(gic_v3, acpi, gic_v3_acpi_driver, gic_v3_acpi_devclass,
0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
-
struct madt_table_data {
device_t parent;
device_t dev;
Modified: head/sys/arm64/arm64/gic_v3_var.h
==
--- head/sys/arm64/arm64/gic_v3_var.h Tue Sep 1 21:17:24 2020
(r365068)
+++ head/sys/arm64/arm64/gic_v3_var.h Tue Sep 1 21:18:06 2020
(r365069)
@@ -82,7 +82,6 @@ struct gic_v3_softc {
struct gic_v3_irqsrc*gic_irqs;
};
-
struct gic_v3_devinfo {
int gic_domain;
int msi_xref;
Modified: head/sys/arm64/arm64/gicv3_its.c
==
--- head/sys/arm64/arm64/gicv3_its.cTue Sep 1 21:17:24 2020
(r365068)
+++ head/sys/arm64/arm64/gicv3_its.cTue Sep 1 21:18:06 2020
(r365069)
@@ -1575,7 +1575,6 @@ its_cmd_wait_completion(device_t dev, struct its_cmd *
}
}
-
static struct its_cmd *
its_cmd_alloc_locked(device_t dev)
{
Modified: head/sys/arm64/arm64/identcpu.c
==
--- head/sys/arm64/arm64/identcpu.c Tue Sep 1 21:17:24 2020
(r365068)
+++
svn commit: r365067 - in head/sys/amd64: acpica amd64 cloudabi64 ia32 include include/pc linux linux32 sgx vmm vmm/amd vmm/intel vmm/io
Author: mjg
Date: Tue Sep 1 21:16:54 2020
New Revision: 365067
URL: https://svnweb.freebsd.org/changeset/base/365067
Log:
amd64: clean up empty lines in .c and .h files
Modified:
head/sys/amd64/acpica/acpi_machdep.c
head/sys/amd64/amd64/bios.c
head/sys/amd64/amd64/copyout.c
head/sys/amd64/amd64/db_disasm.c
head/sys/amd64/amd64/db_trace.c
head/sys/amd64/amd64/fpu.c
head/sys/amd64/amd64/gdb_machdep.c
head/sys/amd64/amd64/genassym.c
head/sys/amd64/amd64/machdep.c
head/sys/amd64/amd64/mem.c
head/sys/amd64/amd64/mp_machdep.c
head/sys/amd64/amd64/pmap.c
head/sys/amd64/amd64/trap.c
head/sys/amd64/cloudabi64/cloudabi64_sysvec.c
head/sys/amd64/ia32/ia32_reg.c
head/sys/amd64/include/param.h
head/sys/amd64/include/pc/bios.h
head/sys/amd64/include/vmm.h
head/sys/amd64/include/vmm_snapshot.h
head/sys/amd64/include/vmparam.h
head/sys/amd64/linux/linux_proto.h
head/sys/amd64/linux32/linux32_machdep.c
head/sys/amd64/linux32/linux32_proto.h
head/sys/amd64/linux32/linux32_sysvec.c
head/sys/amd64/sgx/sgx.c
head/sys/amd64/vmm/amd/amdvi_hw.c
head/sys/amd64/vmm/amd/ivrs_drv.c
head/sys/amd64/vmm/amd/npt.c
head/sys/amd64/vmm/amd/svm.c
head/sys/amd64/vmm/intel/vmcs.c
head/sys/amd64/vmm/intel/vmx_msr.c
head/sys/amd64/vmm/intel/vtd.c
head/sys/amd64/vmm/io/ppt.c
head/sys/amd64/vmm/io/vatpic.c
head/sys/amd64/vmm/io/vatpit.c
head/sys/amd64/vmm/io/vlapic.c
head/sys/amd64/vmm/vmm.c
head/sys/amd64/vmm/vmm_stat.h
Modified: head/sys/amd64/acpica/acpi_machdep.c
==
--- head/sys/amd64/acpica/acpi_machdep.cTue Sep 1 20:58:23 2020
(r365066)
+++ head/sys/amd64/acpica/acpi_machdep.cTue Sep 1 21:16:54 2020
(r365067)
@@ -282,7 +282,6 @@ static device_method_t nexus_acpi_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, nexus_acpi_probe),
DEVMETHOD(device_attach,nexus_acpi_attach),
-
{ 0, 0 }
};
Modified: head/sys/amd64/amd64/bios.c
==
--- head/sys/amd64/amd64/bios.c Tue Sep 1 20:58:23 2020(r365066)
+++ head/sys/amd64/amd64/bios.c Tue Sep 1 21:16:54 2020(r365067)
@@ -85,7 +85,6 @@ bios_sigsearch(u_int32_t start, u_char *sig, int sigle
/* loop searching */
while ((sp + sigofs + siglen) < end) {
-
/* compare here */
if (!bcmp(sp + sigofs, sig, siglen)) {
/* convert back to physical address */
Modified: head/sys/amd64/amd64/copyout.c
==
--- head/sys/amd64/amd64/copyout.c Tue Sep 1 20:58:23 2020
(r365066)
+++ head/sys/amd64/amd64/copyout.c Tue Sep 1 21:16:54 2020
(r365067)
@@ -177,7 +177,6 @@ DEFINE_IFUNC(, int, copyin, (const void *, void *, siz
return (copyin_smap_erms);
default:
return (copyin_nosmap_std);
-
}
}
Modified: head/sys/amd64/amd64/db_disasm.c
==
--- head/sys/amd64/amd64/db_disasm.cTue Sep 1 20:58:23 2020
(r365066)
+++ head/sys/amd64/amd64/db_disasm.cTue Sep 1 21:16:54 2020
(r365067)
@@ -992,7 +992,6 @@ struct i_addr {
};
static const char * const db_reg[2][4][16] = {
-
{{"%al", "%cl", "%dl", "%bl", "%ah", "%ch", "%dh", "%bh",
"%r8b", "%r9b", "%r10b", "%r11b", "%r12b", "%r13b", "%r14b", "%r15b"
},
{ "%ax", "%cx", "%dx", "%bx", "%sp", "%bp", "%si", "%di",
@@ -1573,7 +1572,6 @@ db_disasm(db_addr_t loc, bool altfmt)
db_printf(",");
switch (i_mode & 0xFF) {
-
case E:
db_print_address(seg, size, rex, );
break;
Modified: head/sys/amd64/amd64/db_trace.c
==
--- head/sys/amd64/amd64/db_trace.c Tue Sep 1 20:58:23 2020
(r365066)
+++ head/sys/amd64/amd64/db_trace.c Tue Sep 1 21:16:54 2020
(r365067)
@@ -454,7 +454,6 @@ amd64_set_watch(watchnum, watchaddr, size, access, d)
return (watchnum);
}
-
int
amd64_clr_watch(watchnum, d)
int watchnum;
@@ -470,7 +469,6 @@ amd64_clr_watch(watchnum, d)
return (0);
}
-
int
db_md_set_watchpoint(addr, size)
db_expr_t addr;
@@ -538,7 +536,6 @@ db_md_clr_watchpoint(addr, size)
if (DBREG_DRX((d), i) >= addr &&
DBREG_DRX((d), i) < addr + size)
amd64_clr_watch(i, d);
-
}
}
@@ -554,7 +551,6 @@ db_md_clr_watchpoint(addr, size)
return (0);
}
-
static const char *
watchtype_str(type)
int type;
@@ -566,7 +562,6 @@ watchtype_str(type)
default : return
svn commit: r365068 - in head/sys/arm: allwinner allwinner/a10 allwinner/a20 allwinner/clkng altera/socfpga amlogic/aml8726 annapurna/alpine arm broadcom/bcm2835 freescale freescale/imx freescale/v...
Author: mjg Date: Tue Sep 1 21:17:24 2020 New Revision: 365068 URL: https://svnweb.freebsd.org/changeset/base/365068 Log: arm: clean up empty lines in .c and .h files Modified: head/sys/arm/allwinner/a10/a10_intc.c head/sys/arm/allwinner/a10_ahci.c head/sys/arm/allwinner/a10_codec.c head/sys/arm/allwinner/a10_hdmiaudio.c head/sys/arm/allwinner/a10_sramc.c head/sys/arm/allwinner/a20/a20_cpu_cfg.c head/sys/arm/allwinner/aw_dwc3.c head/sys/arm/allwinner/aw_machdep.c head/sys/arm/allwinner/aw_mmc.c head/sys/arm/allwinner/aw_rtc.c head/sys/arm/allwinner/aw_usbphy.c head/sys/arm/allwinner/aw_wdog.c head/sys/arm/allwinner/aw_wdog.h head/sys/arm/allwinner/axp209.c head/sys/arm/allwinner/axp209reg.h head/sys/arm/allwinner/axp81x.c head/sys/arm/allwinner/clkng/ccu_a10.c head/sys/arm/allwinner/clkng/ccu_a13.c head/sys/arm/allwinner/clkng/ccu_a31.c head/sys/arm/allwinner/clkng/ccu_a83t.c head/sys/arm/allwinner/if_emac.c head/sys/arm/altera/socfpga/socfpga_a10_manager.c head/sys/arm/altera/socfpga/socfpga_common.c head/sys/arm/amlogic/aml8726/aml8726_ccm.c head/sys/arm/amlogic/aml8726/aml8726_ccm.h head/sys/arm/amlogic/aml8726/aml8726_clkmsr.c head/sys/arm/amlogic/aml8726/aml8726_fb.c head/sys/arm/amlogic/aml8726/aml8726_fb.h head/sys/arm/amlogic/aml8726/aml8726_gpio.c head/sys/arm/amlogic/aml8726/aml8726_i2c.c head/sys/arm/amlogic/aml8726/aml8726_mmc.c head/sys/arm/amlogic/aml8726/aml8726_mmc.h head/sys/arm/amlogic/aml8726/aml8726_mp.c head/sys/arm/amlogic/aml8726/aml8726_pinctrl.c head/sys/arm/amlogic/aml8726/aml8726_pinctrl.h head/sys/arm/amlogic/aml8726/aml8726_rng.c head/sys/arm/amlogic/aml8726/aml8726_rtc.c head/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c head/sys/arm/amlogic/aml8726/aml8726_usb_phy-m3.c head/sys/arm/amlogic/aml8726/aml8726_wdt.c head/sys/arm/annapurna/alpine/alpine_ccu.c head/sys/arm/annapurna/alpine/alpine_nb_service.c head/sys/arm/arm/autoconf.c head/sys/arm/arm/bus_space_generic.c head/sys/arm/arm/busdma_machdep.c head/sys/arm/arm/cpufunc.c head/sys/arm/arm/cpuinfo.c head/sys/arm/arm/db_interface.c head/sys/arm/arm/db_trace.c head/sys/arm/arm/disassem.c head/sys/arm/arm/elf_machdep.c head/sys/arm/arm/gdb_machdep.c head/sys/arm/arm/generic_timer.c head/sys/arm/arm/gic.c head/sys/arm/arm/identcpu-v4.c head/sys/arm/arm/identcpu-v6.c head/sys/arm/arm/machdep.c head/sys/arm/arm/machdep_boot.c head/sys/arm/arm/machdep_ptrace.c head/sys/arm/arm/mpcore_timer.c head/sys/arm/arm/nexus.c head/sys/arm/arm/nexusvar.h head/sys/arm/arm/ofw_machdep.c head/sys/arm/arm/pl310.c head/sys/arm/arm/pmap-v4.c head/sys/arm/arm/pmap-v6.c head/sys/arm/arm/syscall.c head/sys/arm/arm/trap-v4.c head/sys/arm/arm/undefined.c head/sys/arm/arm/vfp.c head/sys/arm/arm/vm_machdep.c head/sys/arm/broadcom/bcm2835/bcm2835_audio.c head/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c head/sys/arm/broadcom/bcm2835/bcm2835_fb.c head/sys/arm/broadcom/bcm2835/bcm2835_gpio.c head/sys/arm/broadcom/bcm2835/bcm2835_intr.c head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c head/sys/arm/broadcom/bcm2835/bcm2835_mbox.c head/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h head/sys/arm/broadcom/bcm2835/bcm2835_pwm.c head/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c head/sys/arm/broadcom/bcm2835/bcm2838_pci.c head/sys/arm/broadcom/bcm2835/bcm2838_xhci.c head/sys/arm/freescale/fsl_ocotp.c head/sys/arm/freescale/imx/imx51_ccm.c head/sys/arm/freescale/imx/imx51_ccmreg.h head/sys/arm/freescale/imx/imx51_ipuv3.c head/sys/arm/freescale/imx/imx6_anatop.c head/sys/arm/freescale/imx/imx6_ccm.c head/sys/arm/freescale/imx/imx6_ccmreg.h head/sys/arm/freescale/imx/imx6_mp.c head/sys/arm/freescale/imx/imx6_ssi.c head/sys/arm/freescale/imx/imx6_usbphy.c head/sys/arm/freescale/imx/imx_console.c head/sys/arm/freescale/imx/imx_gpio.c head/sys/arm/freescale/imx/imx_iomux.c head/sys/arm/freescale/imx/imx_machdep.c head/sys/arm/freescale/imx/imx_machdep.h head/sys/arm/freescale/imx/imx_nop_usbphy.c head/sys/arm/freescale/imx/imx_wdogreg.h head/sys/arm/freescale/vybrid/vf_ccm.c head/sys/arm/freescale/vybrid/vf_ehci.c head/sys/arm/freescale/vybrid/vf_gpio.c head/sys/arm/freescale/vybrid/vf_i2c.c head/sys/arm/freescale/vybrid/vf_iomuxc.c head/sys/arm/freescale/vybrid/vf_port.c head/sys/arm/freescale/vybrid/vf_sai.c head/sys/arm/include/asm.h head/sys/arm/include/atomic-v4.h head/sys/arm/include/atomic-v6.h head/sys/arm/include/bus.h head/sys/arm/include/cpu-v4.h head/sys/arm/include/cpufunc.h head/sys/arm/include/cpuinfo.h head/sys/arm/include/elf.h head/sys/arm/include/frame.h head/sys/arm/include/pcb.h head/sys/arm/include/pcpu.h head/sys/arm/include/pl310.h head/sys/arm/include/pmap-v4.h head/sys/arm/include/profile.h head/sys/arm/include/ptrace.h head/sys/arm/include/swi.h
svn commit: r365062 - head/share/man/man9
Author: jmg Date: Tue Sep 1 20:42:48 2020 New Revision: 365062 URL: https://svnweb.freebsd.org/changeset/base/365062 Log: add Xr to device_get_sysctl(9) to make this easier to find Modified: head/share/man/man9/sysctl.9 Modified: head/share/man/man9/sysctl.9 == --- head/share/man/man9/sysctl.9Tue Sep 1 20:41:47 2020 (r365061) +++ head/share/man/man9/sysctl.9Tue Sep 1 20:42:48 2020 (r365062) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 23, 2020 +.Dd September 1, 2020 .Dt SYSCTL 9 .Os .Sh NAME @@ -1041,6 +1041,7 @@ For example: .Sh SEE ALSO .Xr sysctl 3 , .Xr sysctl 8 , +.Xr device_get_sysctl 9 , .Xr sysctl_add_oid 9 , .Xr sysctl_ctx_free 9 , .Xr sysctl_ctx_init 9 , ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365061 - in head/sys: dev/bnxt dev/mgb dev/vmware/vmxnet3 net
Author: vmaffione
Date: Tue Sep 1 20:41:47 2020
New Revision: 365061
URL: https://svnweb.freebsd.org/changeset/base/365061
Log:
iflib: leave only 1 receive descriptor unused
The pidx argument of isc_rxd_flush() indicates which is the last valid
receive descriptor to be used by the NIC. However, current code has
multiple issues:
- Intel drivers write pidx to their RDT register, which means that
NICs will only use the descriptors up to pidx-1 (modulo ring size N),
and won't actually use the one pointed by pidx. This does not break
reception, but it is anyway confusing and suboptimal (the NIC will
actually see only N-2 descriptors as available, rather than N-1).
Other drivers (if_vmx, if_bnxt, if_mgb) adhere to this semantic).
- The semantic used by Intel (RDT is one descriptor past the last
valid one) is used by most (if not all) NICs, and it is also used
on the TX side (also in iflib). Since iflib is not currently
using this semantic for RX, it must decrement fl->ifl_pidx
(modulo N) before calling isc_rxd_flush(), and then the
per-driver callback implementation must increment the index
again (to match the real semantic). This is confusing and suboptimal.
- The iflib refill function is also called at initialization.
However, in case the ring size is smaller than 128 (e.g. if_mgb),
the refill function will actually prepare all the receive
descriptors (N), without leaving one unused, as most of NICs assume
(e.g. to avoid RDT to overrun RDH). I can speculate that the code
looks like this right now because this issue showed up during
testing (e.g. with if_mgb), and it was easy to workaround by
decrementing pidx before isc_rxd_flush().
The goal of this change is to simplify the code (removing a bunch
of instructions from the RX fast path), and to make the semantic of
isc_rxd_flush() consistent across drivers. To achieve this, we:
- change the semantics of the pidx argument to the usual one (that
is the index one past the last valid one), so that both iflib and
drivers avoid the decrement/increment dance.
- fix the initialization code to prepare at most N-1 descriptors.
Reviewed by: markj
MFC after:2 weeks
Differential Revision:https://reviews.freebsd.org/D26191
Modified:
head/sys/dev/bnxt/bnxt_txrx.c
head/sys/dev/mgb/if_mgb.c
head/sys/dev/mgb/if_mgb.h
head/sys/dev/vmware/vmxnet3/if_vmx.c
head/sys/net/iflib.c
Modified: head/sys/dev/bnxt/bnxt_txrx.c
==
--- head/sys/dev/bnxt/bnxt_txrx.c Tue Sep 1 20:13:50 2020
(r365060)
+++ head/sys/dev/bnxt/bnxt_txrx.c Tue Sep 1 20:41:47 2020
(r365061)
@@ -316,10 +316,9 @@ bnxt_isc_rxd_flush(void *sc, uint16_t rxqid, uint8_t f
if (softc->rx_cp_rings[rxqid].cons != UINT32_MAX)
BNXT_CP_IDX_DISABLE_DB(>rx_cp_rings[rxqid].ring,
softc->rx_cp_rings[rxqid].cons);
- /* We're given the last filled RX buffer here, not the next empty one */
- BNXT_RX_DB(rx_ring, RING_NEXT(rx_ring, pidx));
+ BNXT_RX_DB(rx_ring, pidx);
/* TODO: Cumulus+ doesn't need the double doorbell */
- BNXT_RX_DB(rx_ring, RING_NEXT(rx_ring, pidx));
+ BNXT_RX_DB(rx_ring, pidx);
return;
}
Modified: head/sys/dev/mgb/if_mgb.c
==
--- head/sys/dev/mgb/if_mgb.c Tue Sep 1 20:13:50 2020(r365060)
+++ head/sys/dev/mgb/if_mgb.c Tue Sep 1 20:41:47 2020(r365061)
@@ -1191,7 +1191,12 @@ mgb_isc_rxd_flush(void *xsc, uint16_t rxqid, uint8_t f
sc = xsc;
KASSERT(rxqid == 0, ("tried to flush RX Channel %d.\n", rxqid));
- sc->rx_ring_data.last_tail = pidx;
+ /*
+* According to the programming guide, last_tail must be set to
+* the last valid RX descriptor, rather than to the one past that.
+* Note that this is not true for the TX ring!
+*/
+ sc->rx_ring_data.last_tail = MGB_PREV_RING_IDX(pidx);
CSR_WRITE_REG(sc, MGB_DMA_RX_TAIL(rxqid), sc->rx_ring_data.last_tail);
return;
}
Modified: head/sys/dev/mgb/if_mgb.h
==
--- head/sys/dev/mgb/if_mgb.h Tue Sep 1 20:13:50 2020(r365060)
+++ head/sys/dev/mgb/if_mgb.h Tue Sep 1 20:41:47 2020(r365061)
@@ -178,7 +178,8 @@
#define MGB_DESC_GET_FRAME_LEN(_desc) \
(((_desc)->ctl & MGB_DESC_FRAME_LEN_MASK) >> 16)
-#define MGB_NEXT_RING_IDX(_idx)(((_idx) + 1) %
MGB_DMA_RING_SIZE)
+#define MGB_NEXT_RING_IDX(_idx)(((_idx) == MGB_DMA_RING_SIZE -
1) ? 0 : ((_idx_) + 1))
+#define MGB_PREV_RING_IDX(_idx)(((_idx) == 0) ?
(MGB_DMA_RING_SIZE - 1) : ((_idx_) - 1))
#define
Re: svn commit: r365052 - head/usr.bin/script
On Tue, Sep 1, 2020, 10:18 AM Benjamin Kaduk wrote: > On Tue, Sep 1, 2020 at 9:11 AM Warner Losh wrote: > >> Author: imp >> Date: Tue Sep 1 16:11:23 2020 >> New Revision: 365052 >> URL: https://svnweb.freebsd.org/changeset/base/365052 >> >> Log: >> Have script accept and ignore -e for Linux compat >> >> In the util-linux version of script, it will always exit with succes. >> Except when run with -e, in which case it will have the exit value of >> the child. BSD Script already uses the child's exit value for its exit >> value. Some config and other helper scripts depend on being able to >> specify -e. Accept it for compatibility since we'll already to the >> right thing, but otherwise we ignore it. >> >> > What kind of usage is not currently portable but becomes portable as a > result > of this change? I thought the BSD and GNU syntax was inherently pretty > different, > e.g., with '-c' for the command to run vs. implicit positional arguments, > and would > love to be able to retrain myself to something that works everywhere... > -c is also in my queue :). Warner > ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r365054 - in head/sys: conf dev/sdhci
This commit breaks numerous kernels, e.g. _.arm.RPI-B:
In file included from /usr/src/sys/dev/sdhci/sdhci_fsl_fdt.c:45:
/usr/src/sys/dev/extres/clk/clk.h:37:10: fatal error: 'clknode_if.h'
file not found
#include "clknode_if.h"
On 9/1/20, Marcin Wojtas wrote:
> Author: mw
> Date: Tue Sep 1 16:17:21 2020
> New Revision: 365054
> URL: https://svnweb.freebsd.org/changeset/base/365054
>
> Log:
> Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs
>
> Implement support for an eSDHC controller found in NXP QorIQ Layerscape
> SoCs.
>
> This driver has been tested with NXP LS1046A and LX2160A (Honeycomb
> board),
> which is incompatible with the existing sdhci_fsl driver (aiming at older
> chips from this family). As such, it is not intended as replacement for
> the old driver, but rather serves as an improved alternative for SoCs
> that
> support it.
> It comes with support for both PIO and Single DMA modes and samples the
> clock from the extres clk API.
>
> Submitted by: Artur Rojek
> Reviewed by: manu, mmel, kibab
> Obtained from: Semihalf
> Sponsored by: Alstom Group
> Differential Revision: https://reviews.freebsd.org/D26153
>
> Added:
> head/sys/dev/sdhci/sdhci_fsl_fdt.c (contents, props changed)
> Modified:
> head/sys/conf/files
>
> Modified: head/sys/conf/files
> ==
> --- head/sys/conf/files Tue Sep 1 16:13:09 2020(r365053)
> +++ head/sys/conf/files Tue Sep 1 16:17:21 2020(r365054)
> @@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c optional scc
> dev/sdhci/sdhci.coptional sdhci
> dev/sdhci/sdhci_fdt.coptional sdhci fdt
> dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio
> +dev/sdhci/sdhci_fsl_fdt.coptional sdhci fdt gpio
> dev/sdhci/sdhci_if.m optional sdhci
> dev/sdhci/sdhci_acpi.c optional sdhci acpi
> dev/sdhci/sdhci_pci.coptional sdhci pci
>
> Added: head/sys/dev/sdhci/sdhci_fsl_fdt.c
> ==
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/sys/dev/sdhci/sdhci_fsl_fdt.cTue Sep 1 16:17:21 2020
> (r365054)
> @@ -0,0 +1,680 @@
> +/*-
> + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
> + *
> + * Copyright (c) 2020 Alstom Group.
> + * Copyright (c) 2020 Semihalf.
> + *
> + * 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.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 THE AUTHOR OR 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.
> + */
> +
> +/* eSDHC controller driver for NXP QorIQ Layerscape SoCs. */
> +
> +#include
> +__FBSDID("$FreeBSD$");
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +#include
> +#include
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +#include "mmcbr_if.h"
> +#include "sdhci_if.h"
> +
> +#define RD4 (sc->read)
> +#define WR4 (sc->write)
> +
> +#define SDHCI_FSL_PRES_STATE0x24
> +#define SDHCI_FSL_PRES_SDSTB(1 << 3)
> +#define SDHCI_FSL_PRES_COMPAT_MASK 0x000f0f07
> +
> +#define SDHCI_FSL_PROT_CTRL 0x28
> +#define SDHCI_FSL_PROT_CTRL_WIDTH_1BIT (0 << 1)
> +#define SDHCI_FSL_PROT_CTRL_WIDTH_4BIT (1 << 1)
> +#define SDHCI_FSL_PROT_CTRL_WIDTH_8BIT (2 << 1)
> +#define SDHCI_FSL_PROT_CTRL_WIDTH_MASK (3 << 1)
> +#define SDHCI_FSL_PROT_CTRL_BYTE_SWAP (0 << 4)
> +#define SDHCI_FSL_PROT_CTRL_BYTE_NATIVE (2 << 4)
> +#define SDHCI_FSL_PROT_CTRL_BYTE_MASK (3 << 4)
> +#define SDHCI_FSL_PROT_CTRL_DMA_MASK(3 << 8)
> +
> +#define
svn commit: r365060 - head/sys/dev/qlxgb
Author: markj Date: Tue Sep 1 20:13:50 2020 New Revision: 365060 URL: https://svnweb.freebsd.org/changeset/base/365060 Log: qlxgb: Initialize if_mtu before setting max_frame_size. Previously we were relying on ether_ifattach() to set if_mtu, but max_frame_size is initialized earlier. This fixes a regression introduced by r250375. PR: 249050 Submitted by: Christian Vallières MFC after:3 days Modified: head/sys/dev/qlxgb/qla_os.c Modified: head/sys/dev/qlxgb/qla_os.c == --- head/sys/dev/qlxgb/qla_os.c Tue Sep 1 19:54:43 2020(r365059) +++ head/sys/dev/qlxgb/qla_os.c Tue Sep 1 20:13:50 2020(r365060) @@ -671,6 +671,7 @@ qla_init_ifnet(device_t dev, qla_host_t *ha) if_initname(ifp, device_get_name(dev), device_get_unit(dev)); + ifp->if_mtu = ETHERMTU; ifp->if_baudrate = IF_Gbps(10); ifp->if_init = qla_init; ifp->if_softc = ha; ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365058 - head/share/man/man4
Author: ian Date: Tue Sep 1 19:06:08 2020 New Revision: 365058 URL: https://svnweb.freebsd.org/changeset/base/365058 Log: Document the fact that you must set an i2c slave address as well as the upstream iicbus to configure this device using hints. Modified: head/share/man/man4/ltc430x.4 Modified: head/share/man/man4/ltc430x.4 == --- head/share/man/man4/ltc430x.4 Tue Sep 1 19:02:07 2020 (r365057) +++ head/share/man/man4/ltc430x.4 Tue Sep 1 19:06:08 2020 (r365058) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 1, 2020 +.Dd September 1, 2020 .Dt LTC430X 4 .Os .Sh NAME @@ -97,6 +97,10 @@ The upstream the .Nm instance is attached to. +.It Va hint.ltc430x..addr +The slave address of the +.Nm +instance on the upstream bus. .El .Pp When configured via hints, the driver automatically adds an iicbus ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365057 - head/cddl/usr.bin
Author: freqlabs
Date: Tue Sep 1 19:02:07 2020
New Revision: 365057
URL: https://svnweb.freebsd.org/changeset/base/365057
Log:
Ensure zstreamdump subdir can be visited
Reported by: Thomas Laus
Sponsored by: iXsystems, Inc.
Modified:
head/cddl/usr.bin/Makefile
Modified: head/cddl/usr.bin/Makefile
==
--- head/cddl/usr.bin/Makefile Tue Sep 1 18:50:26 2020(r365056)
+++ head/cddl/usr.bin/Makefile Tue Sep 1 19:02:07 2020(r365057)
@@ -18,6 +18,7 @@ _zinject= zinject
.if ${MK_LIBTHR} != "no"
_ztest=ztest
_zstream = zstream
+_zstreamdump = zstreamdump
.endif
.endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365056 - head/sbin/fsck_ffs
Author: chs
Date: Tue Sep 1 18:50:26 2020
New Revision: 365056
URL: https://svnweb.freebsd.org/changeset/base/365056
Log:
Move all of the error prints in readsb() from stderr to stdout.
The only output from fsck that should go to stderr is the usage message.
if setup() fails then exit with EEXIT rather than 0.
Reviewed by: mckusick
Sponsored by: Netflix
Modified:
head/sbin/fsck_ffs/main.c
head/sbin/fsck_ffs/setup.c
Modified: head/sbin/fsck_ffs/main.c
==
--- head/sbin/fsck_ffs/main.c Tue Sep 1 16:20:42 2020(r365055)
+++ head/sbin/fsck_ffs/main.c Tue Sep 1 18:50:26 2020(r365056)
@@ -408,7 +408,7 @@ checkfilesys(char *filesys)
case 0:
if (preen)
pfatal("CAN'T CHECK FILE SYSTEM.");
- return (0);
+ return (EEXIT);
case -1:
clean:
pwarn("clean, %ld free ", (long)(sblock.fs_cstotal.cs_nffree +
Modified: head/sbin/fsck_ffs/setup.c
==
--- head/sbin/fsck_ffs/setup.c Tue Sep 1 16:20:42 2020(r365055)
+++ head/sbin/fsck_ffs/setup.c Tue Sep 1 18:50:26 2020(r365056)
@@ -339,15 +339,15 @@ readsb(int listerr)
return (0);
case ENOENT:
if (bflag)
- fprintf(stderr, "%jd is not a file system "
+ printf("%jd is not a file system "
"superblock\n", super / dev_bsize);
else
- fprintf(stderr, "Cannot find file system "
+ printf("Cannot find file system "
"superblock\n");
return (0);
case EIO:
default:
- fprintf(stderr, "I/O error reading %jd\n",
+ printf("I/O error reading %jd\n",
super / dev_bsize);
return (0);
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r365054 - in head/sys: conf dev/sdhci
On Tue, 2020-09-01 at 17:27 +0100, Andrew Turner wrote: > > On 1 Sep 2020, at 17:17, Marcin Wojtas wrote: > > > > Author: mw > > Date: Tue Sep 1 16:17:21 2020 > > New Revision: 365054 > > URL: https://svnweb.freebsd.org/changeset/base/365054 > > > > Log: > > Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs > > > > Implement support for an eSDHC controller found in NXP QorIQ > > Layerscape SoCs. > > > > This driver has been tested with NXP LS1046A and LX2160A > > (Honeycomb board), > > which is incompatible with the existing sdhci_fsl driver (aiming > > at older > > chips from this family). As such, it is not intended as > > replacement for > > the old driver, but rather serves as an improved alternative for > > SoCs that > > support it. > > It comes with support for both PIO and Single DMA modes and > > samples the > > clock from the extres clk API. > > > > Submitted by: Artur Rojek > > Reviewed by: manu, mmel, kibab > > Obtained from: Semihalf > > Sponsored by: Alstom Group > > Differential Revision: https://reviews.freebsd.org/D26153 > > > > Added: > > head/sys/dev/sdhci/sdhci_fsl_fdt.c (contents, props changed) > > Modified: > > head/sys/conf/files > > > > Modified: head/sys/conf/files > > === > > === > > --- head/sys/conf/files Tue Sep 1 16:13:09 2020(r365053) > > +++ head/sys/conf/files Tue Sep 1 16:17:21 2020(r365054) > > @@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c optiona > > l scc > > dev/sdhci/sdhci.c optional sdhci > > dev/sdhci/sdhci_fdt.c optional sdhci fdt > > dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio > > +dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio > > This looks wrong. It should be using an NXP specific option, not > gpio. > > Andrew In addition to gpio, not instead of it (the new driver uses the fdt gpio helper stuff for card detect and write protect). -- Ian ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r365054 - in head/sys: conf dev/sdhci
> On 1 Sep 2020, at 17:17, Marcin Wojtas wrote: > > Author: mw > Date: Tue Sep 1 16:17:21 2020 > New Revision: 365054 > URL: https://svnweb.freebsd.org/changeset/base/365054 > > Log: > Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs > > Implement support for an eSDHC controller found in NXP QorIQ Layerscape SoCs. > > This driver has been tested with NXP LS1046A and LX2160A (Honeycomb board), > which is incompatible with the existing sdhci_fsl driver (aiming at older > chips from this family). As such, it is not intended as replacement for > the old driver, but rather serves as an improved alternative for SoCs that > support it. > It comes with support for both PIO and Single DMA modes and samples the > clock from the extres clk API. > > Submitted by: Artur Rojek > Reviewed by: manu, mmel, kibab > Obtained from: Semihalf > Sponsored by: Alstom Group > Differential Revision: https://reviews.freebsd.org/D26153 > > Added: > head/sys/dev/sdhci/sdhci_fsl_fdt.c (contents, props changed) > Modified: > head/sys/conf/files > > Modified: head/sys/conf/files > == > --- head/sys/conf/files Tue Sep 1 16:13:09 2020(r365053) > +++ head/sys/conf/files Tue Sep 1 16:17:21 2020(r365054) > @@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c optional scc > dev/sdhci/sdhci.c optional sdhci > dev/sdhci/sdhci_fdt.c optional sdhci fdt > dev/sdhci/sdhci_fdt_gpio.coptional sdhci fdt gpio > +dev/sdhci/sdhci_fsl_fdt.coptional sdhci fdt gpio This looks wrong. It should be using an NXP specific option, not gpio. Andrew ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r365052 - head/usr.bin/script
On Tue, Sep 01, 2020 at 04:11:23PM +, Warner Losh wrote:
> Author: imp
> Date: Tue Sep 1 16:11:23 2020
> New Revision: 365052
> URL: https://svnweb.freebsd.org/changeset/base/365052
>
> Log:
> Have script accept and ignore -e for Linux compat
>
> In the util-linux version of script, it will always exit with succes.
> Except when run with -e, in which case it will have the exit value of
> the child. BSD Script already uses the child's exit value for its exit
> value. Some config and other helper scripts depend on being able to
> specify -e. Accept it for compatibility since we'll already to the
> right thing, but otherwise we ignore it.
>
> Modified:
> head/usr.bin/script/script.1
> head/usr.bin/script/script.c
>
> Modified: head/usr.bin/script/script.1
> ==
> --- head/usr.bin/script/script.1 Tue Sep 1 15:52:18 2020
> (r365051)
> +++ head/usr.bin/script/script.1 Tue Sep 1 16:11:23 2020
> (r365052)
> @@ -36,7 +36,7 @@
> .Nd make typescript of terminal session
> .Sh SYNOPSIS
> .Nm
> -.Op Fl adfkpqr
> +.Op Fl adefkpqr
> .Op Fl F Ar pipe
> .Op Fl t Ar time
> .Op Ar file Op Ar command ...
> @@ -77,6 +77,12 @@ retaining the prior contents.
> When playing back a session with the
> .Fl p
> flag, do not sleep between records when playing back a timestamped session.
> +.It Fl e
> +Accepted for compatibility with
> +.Em util-linux
> +.Nm .
> +The child command exit status is always the exit status of
> +.Nm .
> .It Fl F Ar pipe
> Immediately flush output after each write.
> This will allow a user to create a named pipe using
>
> Modified: head/usr.bin/script/script.c
> ==
> --- head/usr.bin/script/script.c Tue Sep 1 15:52:18 2020
> (r365051)
> +++ head/usr.bin/script/script.c Tue Sep 1 16:11:23 2020
> (r365052)
> @@ -111,13 +111,15 @@ main(int argc, char *argv[])
> warning. (not needed w/clang) */
> showexit = 0;
>
> - while ((ch = getopt(argc, argv, "adFfkpqrt:")) != -1)
> + while ((ch = getopt(argc, argv, "adeFfkpqrt:")) != -1)
> switch(ch) {
> case 'a':
> aflg = 1;
> break;
> case 'd':
> usesleep = 0;
> + break;
> + case 'e': /* Default behaior, accepted for linux compat */
^^^
You have a typo here,
Best regards,
Bapt
signature.asc
Description: PGP signature
svn commit: r365055 - head/lib/libc/tests/resolv
Author: jhb
Date: Tue Sep 1 16:20:42 2020
New Revision: 365055
URL: https://svnweb.freebsd.org/changeset/base/365055
Log:
Fix a buffer overrun.
getln() returns 'len' valid characters. line[len] is out of bounds.
Reported by: CHERI
Reviewed by: brooks
Obtained from:CheriBSD
MFC after:2 weeks
Sponsored by: DARPA
Differential Revision:https://reviews.freebsd.org/D26197
Modified:
head/lib/libc/tests/resolv/resolv_test.c
Modified: head/lib/libc/tests/resolv/resolv_test.c
==
--- head/lib/libc/tests/resolv/resolv_test.cTue Sep 1 16:17:21 2020
(r365054)
+++ head/lib/libc/tests/resolv/resolv_test.cTue Sep 1 16:20:42 2020
(r365055)
@@ -76,15 +76,15 @@ load(const char *fname)
if ((fp = fopen(fname, "r")) == NULL)
ATF_REQUIRE(fp != NULL);
while ((line = fgetln(fp, )) != NULL) {
- char c = line[len];
+ char c = line[len - 1];
char *ptr;
- line[len] = '\0';
+ line[len - 1] = '\0';
for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS)) {
if (ptr == '\0' || ptr[0] == '#')
continue;
sl_add(hosts, strdup(ptr));
}
- line[len] = c;
+ line[len - 1] = c;
}
(void)fclose(fp);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r365052 - head/usr.bin/script
On Tue, Sep 1, 2020 at 9:11 AM Warner Losh wrote: > Author: imp > Date: Tue Sep 1 16:11:23 2020 > New Revision: 365052 > URL: https://svnweb.freebsd.org/changeset/base/365052 > > Log: > Have script accept and ignore -e for Linux compat > > In the util-linux version of script, it will always exit with succes. > Except when run with -e, in which case it will have the exit value of > the child. BSD Script already uses the child's exit value for its exit > value. Some config and other helper scripts depend on being able to > specify -e. Accept it for compatibility since we'll already to the > right thing, but otherwise we ignore it. > > What kind of usage is not currently portable but becomes portable as a result of this change? I thought the BSD and GNU syntax was inherently pretty different, e.g., with '-c' for the command to run vs. implicit positional arguments, and would love to be able to retrain myself to something that works everywhere... -Ben ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365054 - in head/sys: conf dev/sdhci
Author: mw
Date: Tue Sep 1 16:17:21 2020
New Revision: 365054
URL: https://svnweb.freebsd.org/changeset/base/365054
Log:
Introduce the SDHCI driver for NXP QorIQ Layerscape SoCs
Implement support for an eSDHC controller found in NXP QorIQ Layerscape SoCs.
This driver has been tested with NXP LS1046A and LX2160A (Honeycomb board),
which is incompatible with the existing sdhci_fsl driver (aiming at older
chips from this family). As such, it is not intended as replacement for
the old driver, but rather serves as an improved alternative for SoCs that
support it.
It comes with support for both PIO and Single DMA modes and samples the
clock from the extres clk API.
Submitted by: Artur Rojek
Reviewed by: manu, mmel, kibab
Obtained from: Semihalf
Sponsored by: Alstom Group
Differential Revision: https://reviews.freebsd.org/D26153
Added:
head/sys/dev/sdhci/sdhci_fsl_fdt.c (contents, props changed)
Modified:
head/sys/conf/files
Modified: head/sys/conf/files
==
--- head/sys/conf/files Tue Sep 1 16:13:09 2020(r365053)
+++ head/sys/conf/files Tue Sep 1 16:17:21 2020(r365054)
@@ -3058,6 +3058,7 @@ dev/scc/scc_dev_z8530.c optional scc
dev/sdhci/sdhci.c optional sdhci
dev/sdhci/sdhci_fdt.c optional sdhci fdt
dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio
+dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio
dev/sdhci/sdhci_if.m optional sdhci
dev/sdhci/sdhci_acpi.c optional sdhci acpi
dev/sdhci/sdhci_pci.c optional sdhci pci
Added: head/sys/dev/sdhci/sdhci_fsl_fdt.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/sdhci/sdhci_fsl_fdt.c Tue Sep 1 16:17:21 2020
(r365054)
@@ -0,0 +1,680 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2020 Alstom Group.
+ * Copyright (c) 2020 Semihalf.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 THE AUTHOR OR 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.
+ */
+
+/* eSDHC controller driver for NXP QorIQ Layerscape SoCs. */
+
+#include
+__FBSDID("$FreeBSD$");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "mmcbr_if.h"
+#include "sdhci_if.h"
+
+#defineRD4 (sc->read)
+#defineWR4 (sc->write)
+
+#defineSDHCI_FSL_PRES_STATE0x24
+#defineSDHCI_FSL_PRES_SDSTB(1 << 3)
+#defineSDHCI_FSL_PRES_COMPAT_MASK 0x000f0f07
+
+#defineSDHCI_FSL_PROT_CTRL 0x28
+#defineSDHCI_FSL_PROT_CTRL_WIDTH_1BIT (0 << 1)
+#defineSDHCI_FSL_PROT_CTRL_WIDTH_4BIT (1 << 1)
+#defineSDHCI_FSL_PROT_CTRL_WIDTH_8BIT (2 << 1)
+#defineSDHCI_FSL_PROT_CTRL_WIDTH_MASK (3 << 1)
+#defineSDHCI_FSL_PROT_CTRL_BYTE_SWAP (0 << 4)
+#defineSDHCI_FSL_PROT_CTRL_BYTE_NATIVE (2 << 4)
+#defineSDHCI_FSL_PROT_CTRL_BYTE_MASK (3 << 4)
+#defineSDHCI_FSL_PROT_CTRL_DMA_MASK(3 << 8)
+
+#defineSDHCI_FSL_SYS_CTRL 0x2c
+#defineSDHCI_FSL_CLK_IPGEN (1 << 0)
+#defineSDHCI_FSL_CLK_SDCLKEN (1 << 3)
+#defineSDHCI_FSL_CLK_DIVIDER_MASK 0x00f0
+#defineSDHCI_FSL_CLK_DIVIDER_SHIFT 4
+#defineSDHCI_FSL_CLK_PRESCALE_MASK 0xff00
+#defineSDHCI_FSL_CLK_PRESCALE_SHIFT8
+
+#defineSDHCI_FSL_WTMK_LVL 0x44
+#defineSDHCI_FSL_WTMK_RD_512B (0 << 0)
+#define
svn commit: r365053 - head/usr.bin/script
Author: imp Date: Tue Sep 1 16:13:09 2020 New Revision: 365053 URL: https://svnweb.freebsd.org/changeset/base/365053 Log: Bump date for r365052 Modified: head/usr.bin/script/script.1 Modified: head/usr.bin/script/script.1 == --- head/usr.bin/script/script.1Tue Sep 1 16:11:23 2020 (r365052) +++ head/usr.bin/script/script.1Tue Sep 1 16:13:09 2020 (r365053) @@ -28,7 +28,7 @@ .\"@(#)script.18.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd December 4, 2013 +.Dd September 1, 2020 .Dt SCRIPT 1 .Os .Sh NAME ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365052 - head/usr.bin/script
Author: imp
Date: Tue Sep 1 16:11:23 2020
New Revision: 365052
URL: https://svnweb.freebsd.org/changeset/base/365052
Log:
Have script accept and ignore -e for Linux compat
In the util-linux version of script, it will always exit with succes.
Except when run with -e, in which case it will have the exit value of
the child. BSD Script already uses the child's exit value for its exit
value. Some config and other helper scripts depend on being able to
specify -e. Accept it for compatibility since we'll already to the
right thing, but otherwise we ignore it.
Modified:
head/usr.bin/script/script.1
head/usr.bin/script/script.c
Modified: head/usr.bin/script/script.1
==
--- head/usr.bin/script/script.1Tue Sep 1 15:52:18 2020
(r365051)
+++ head/usr.bin/script/script.1Tue Sep 1 16:11:23 2020
(r365052)
@@ -36,7 +36,7 @@
.Nd make typescript of terminal session
.Sh SYNOPSIS
.Nm
-.Op Fl adfkpqr
+.Op Fl adefkpqr
.Op Fl F Ar pipe
.Op Fl t Ar time
.Op Ar file Op Ar command ...
@@ -77,6 +77,12 @@ retaining the prior contents.
When playing back a session with the
.Fl p
flag, do not sleep between records when playing back a timestamped session.
+.It Fl e
+Accepted for compatibility with
+.Em util-linux
+.Nm .
+The child command exit status is always the exit status of
+.Nm .
.It Fl F Ar pipe
Immediately flush output after each write.
This will allow a user to create a named pipe using
Modified: head/usr.bin/script/script.c
==
--- head/usr.bin/script/script.cTue Sep 1 15:52:18 2020
(r365051)
+++ head/usr.bin/script/script.cTue Sep 1 16:11:23 2020
(r365052)
@@ -111,13 +111,15 @@ main(int argc, char *argv[])
warning. (not needed w/clang) */
showexit = 0;
- while ((ch = getopt(argc, argv, "adFfkpqrt:")) != -1)
+ while ((ch = getopt(argc, argv, "adeFfkpqrt:")) != -1)
switch(ch) {
case 'a':
aflg = 1;
break;
case 'd':
usesleep = 0;
+ break;
+ case 'e': /* Default behaior, accepted for linux compat */
break;
case 'F':
Fflg = 1;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365051 - head/usr.sbin/pmc
Author: vangyzen
Date: Tue Sep 1 15:52:18 2020
New Revision: 365051
URL: https://svnweb.freebsd.org/changeset/base/365051
Log:
pmc: Fix freed internal location read
Coverity detected this error. The fix duplicates the assignment on line 171.
Submitted by: bret_ketc...@dell.com
Reported by: Coverity
MFC after:2 weeks
Sponsored by: Dell EMC Isilon
Differential Revision:https://reviews.freebsd.org/D26227
Modified:
head/usr.sbin/pmc/cmd_pmc_summary.cc
Modified: head/usr.sbin/pmc/cmd_pmc_summary.cc
==
--- head/usr.sbin/pmc/cmd_pmc_summary.ccTue Sep 1 15:33:57 2020
(r365050)
+++ head/usr.sbin/pmc/cmd_pmc_summary.ccTue Sep 1 15:52:18 2020
(r365051)
@@ -156,7 +156,7 @@ pmc_summary_handler(int logfd, int k, bool do_full)
auto rate = ratemap[kv.first];
std::cout << "idx: " << kv.first << " name: " << name
<< " rate: " << rate << std::endl;
while (!kv.second.empty()) {
- auto = kv.second.back();
+ auto val = kv.second.back();
kv.second.pop_back();
std::cout << val.second << ": " << val.first <<
std::endl;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365050 - head/sys/dev/intel
Author: takawata
Date: Tue Sep 1 15:33:57 2020
New Revision: 365050
URL: https://svnweb.freebsd.org/changeset/base/365050
Log:
Add Cannon Point PCH Thermal Controller Device ID.
PR: 249047
Reported by: Dries Michiels
--This line, and those below, will be ignored--
> Description of fields to fill in above: 76 columns --|
> PR: If and which Problem Report is related.
> Submitted by: If someone else sent in the change.
> Reported by: If someone else reported the issue.
> Reviewed by: If someone else reviewed your modification.
> Approved by: If you needed approval for this commit.
> Obtained from:If the change is from a third party.
> MFC after:N [day[s]|week[s]|month[s]]. Request a reminder
email.
> MFH: Ports tree branch name. Request approval for
merge.
> Relnotes: Set to 'yes' for mention in release notes.
> Security: Vulnerability reference (one per line) or
description.
> Sponsored by: If the change was sponsored by an organization
(each collaborator).
> Differential Revision:https://reviews.freebsd.org/D### (*full* phabric
URL needed).
> Empty fields above will be automatically removed.
Mpchtherm.c
Modified:
head/sys/dev/intel/pchtherm.c
Modified: head/sys/dev/intel/pchtherm.c
==
--- head/sys/dev/intel/pchtherm.c Tue Sep 1 15:30:40 2020
(r365049)
+++ head/sys/dev/intel/pchtherm.c Tue Sep 1 15:33:57 2020
(r365050)
@@ -95,6 +95,8 @@ static const struct pci_device_table pchtherm_devices[
PCI_DESCR("Skylake PCH Thermal Subsystem")},
{ PCI_DEV(0x8086, 0xa131),
PCI_DESCR("Skylake PCH 100 Thermal Subsystem")},
+ { PCI_DEV(0x8086, 0x9df9),
+ PCI_DESCR("Cannon Lake PCH Thermal Controller")},
};
static int pchtherm_probe(device_t dev)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365049 - head/share/man/man7
Author: emaste Date: Tue Sep 1 15:30:40 2020 New Revision: 365049 URL: https://svnweb.freebsd.org/changeset/base/365049 Log: release.7: update for current context It's no longer unusual to be able to build a release with a single command, so drop "actually" that hints at a surprise. Also just use "network install directory" instead of referencing FTP; it's more likely to be HTTP now. Reviewed by: gjb Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D26260 Modified: head/share/man/man7/release.7 Modified: head/share/man/man7/release.7 == --- head/share/man/man7/release.7 Tue Sep 1 15:15:44 2020 (r365048) +++ head/share/man/man7/release.7 Tue Sep 1 15:30:40 2020 (r365049) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 16, 2020 +.Dd September 1, 2020 .Dt RELEASE 7 .Os .Sh NAME @@ -40,9 +40,9 @@ All of the tools necessary to build a release are avai .Fx source code repository in .Pa src/release . -A complete release can actually be built with only a single command, +A complete release can be built with only a single command, including the creation of ISO images suitable for burning to CD-ROM, -memory stick images, and an FTP install directory. +memory stick images, and a network install directory. This command is aptly named .Dq Li "make release" . .Pp @@ -96,7 +96,7 @@ assurance, or other aspects of the release engineering .Sh CLEAN RELEASE GENERATION Official releases of .Fx -are produced in a totally clean environment to +are produced in a clean environment to ensure consistency between the versions of the src, ports, and doc trees and to avoid contamination from the host system .Po such as local patches, changes ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365047 - head/cddl/lib/libdtrace
Author: markj Date: Tue Sep 1 15:15:22 2020 New Revision: 365047 URL: https://svnweb.freebsd.org/changeset/base/365047 Log: Correct the D definition for EINTEGRITY. MFC after:1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Modified: head/cddl/lib/libdtrace/errno.d Modified: head/cddl/lib/libdtrace/errno.d == --- head/cddl/lib/libdtrace/errno.d Tue Sep 1 15:15:09 2020 (r365046) +++ head/cddl/lib/libdtrace/errno.d Tue Sep 1 15:15:22 2020 (r365047) @@ -225,7 +225,7 @@ inline int ENOTRECOVERABLE = 95; #pragma D binding "1.13" ENOTRECOVERABLE inline int EOWNERDEAD = 96; #pragma D binding "1.13" EOWNERDEAD -inline int EINTEGRITY = 96; +inline int EINTEGRITY = 97; #pragma D binding "1.13" EINTEGRITY inline int ELAST = 97; #pragma D binding "1.0" ELAST ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365046 - head/usr.sbin/pw
Author: markj
Date: Tue Sep 1 15:15:09 2020
New Revision: 365046
URL: https://svnweb.freebsd.org/changeset/base/365046
Log:
pw: Handle errors from ftell() when removing records from /etc/opiekeys.
Reported by: Coverity
MFC after:1 week
Sponsored by: NetApp, Inc.
Sponsored by: Klara, Inc.
Modified:
head/usr.sbin/pw/pw_user.c
Modified: head/usr.sbin/pw/pw_user.c
==
--- head/usr.sbin/pw/pw_user.c Tue Sep 1 15:14:51 2020(r365045)
+++ head/usr.sbin/pw/pw_user.c Tue Sep 1 15:15:09 2020(r365046)
@@ -712,24 +712,24 @@ rmopie(char const * name)
{
char tmp[1014];
FILE *fp;
- int fd;
size_t len;
- off_t atofs = 0;
-
+ long atofs;
+ int fd;
+
if ((fd = openat(conf.rootfd, "etc/opiekeys", O_RDWR)) == -1)
return;
fp = fdopen(fd, "r+");
len = strlen(name);
- while (fgets(tmp, sizeof(tmp), fp) != NULL) {
+ for (atofs = 0; fgets(tmp, sizeof(tmp), fp) != NULL && atofs >= 0;
+ atofs = ftell(fp)) {
if (strncmp(name, tmp, len) == 0 && tmp[len]==' ') {
/* Comment username out */
if (fseek(fp, atofs, SEEK_SET) == 0)
fwrite("#", 1, 1, fp);
break;
}
- atofs = ftell(fp);
}
/*
* If we got an error of any sort, don't update!
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365048 - head/sys/cddl/dev/dtrace/amd64
Author: markj
Date: Tue Sep 1 15:15:44 2020
New Revision: 365048
URL: https://svnweb.freebsd.org/changeset/base/365048
Log:
Tighten frame pointer checking in DTrace's amd64 stack unwinder.
Avoid assuming that the kernel was compiled with
-fno-omit-frame-pointer.
MFC after:1 week
Sponsored by: NetApp, Inc.
Sponsored by: Klara, Inc.
Modified:
head/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
Modified: head/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
==
--- head/sys/cddl/dev/dtrace/amd64/dtrace_isa.c Tue Sep 1 15:15:22 2020
(r365047)
+++ head/sys/cddl/dev/dtrace/amd64/dtrace_isa.c Tue Sep 1 15:15:44 2020
(r365048)
@@ -56,6 +56,7 @@ void
dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes,
uint32_t *intrpc)
{
+ struct thread *td;
int depth = 0;
register_t rbp;
struct amd64_frame *frame;
@@ -70,10 +71,16 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, in
__asm __volatile("movq %%rbp,%0" : "=r" (rbp));
frame = (struct amd64_frame *)rbp;
+ td = curthread;
while (depth < pcstack_limit) {
if (!INKERNEL((long) frame))
break;
+ if ((vm_offset_t)frame >=
+ td->td_kstack + ptoa(td->td_kstack_pages) ||
+ (vm_offset_t)frame < td->td_kstack)
+ break;
+
callpc = frame->f_retaddr;
if (!INKERNEL(callpc))
@@ -84,14 +91,11 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, in
if ((aframes == 0) && (caller != 0)) {
pcstack[depth++] = caller;
}
- }
- else {
+ } else {
pcstack[depth++] = callpc;
}
- if (frame->f_frame <= frame ||
- (vm_offset_t)frame->f_frame >= curthread->td_kstack +
- curthread->td_kstack_pages * PAGE_SIZE)
+ if ((vm_offset_t)frame->f_frame <= (vm_offset_t)frame)
break;
frame = frame->f_frame;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365044 - head/usr.sbin/pw
Author: markj
Date: Tue Sep 1 15:14:26 2020
New Revision: 365044
URL: https://svnweb.freebsd.org/changeset/base/365044
Log:
pw: Remove unnecessary errp checks.
The caller-supplied pointer is unconditionally dereferenced at the
beginning of the function, so there is no point in comparing it with
NULL thereafter.
Reported by: Coverity
MFC after:1 week
Sponsored by: NetApp, Inc.
Sponsored by: Klara, Inc.
Modified:
head/usr.sbin/pw/strtounum.c
Modified: head/usr.sbin/pw/strtounum.c
==
--- head/usr.sbin/pw/strtounum.cTue Sep 1 15:14:13 2020
(r365043)
+++ head/usr.sbin/pw/strtounum.cTue Sep 1 15:14:26 2020
(r365044)
@@ -44,28 +44,24 @@ strtounum(const char * __restrict np, uintmax_t minval
*errpp = NULL;
if (minval > maxval) {
errno = EINVAL;
- if (errpp != NULL)
- *errpp = "invalid";
+ *errpp = "invalid";
return (0);
}
errno = 0;
ret = strtoumax(np, , 10);
if (endp == np || *endp != '\0') {
errno = EINVAL;
- if (errpp != NULL)
- *errpp = "invalid";
+ *errpp = "invalid";
return (0);
}
if (ret < minval) {
errno = ERANGE;
- if (errpp != NULL)
- *errpp = "too small";
+ *errpp = "too small";
return (0);
}
if (errno == ERANGE || ret > maxval) {
errno = ERANGE;
- if (errpp != NULL)
- *errpp = "too large";
+ *errpp = "too large";
return (0);
}
return (ret);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365045 - head/usr.sbin/pw
Author: markj
Date: Tue Sep 1 15:14:51 2020
New Revision: 365045
URL: https://svnweb.freebsd.org/changeset/base/365045
Log:
pw: Fix a resource leak.
Reported by: Coverity
MFC after:1 week
Sponsored by: NetApp, Inc.
Sponsored by: Klara, Inc.
Modified:
head/usr.sbin/pw/rm_r.c
Modified: head/usr.sbin/pw/rm_r.c
==
--- head/usr.sbin/pw/rm_r.c Tue Sep 1 15:14:26 2020(r365044)
+++ head/usr.sbin/pw/rm_r.c Tue Sep 1 15:14:51 2020(r365045)
@@ -57,6 +57,10 @@ rm_r(int rootfd, const char *path, uid_t uid)
}
d = fdopendir(dirfd);
+ if (d == NULL) {
+ (void)close(dirfd);
+ return;
+ }
while ((e = readdir(d)) != NULL) {
if (strcmp(e->d_name, ".") == 0 || strcmp(e->d_name, "..") == 0)
continue;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365043 - head/usr.sbin/pw
Author: markj
Date: Tue Sep 1 15:14:13 2020
New Revision: 365043
URL: https://svnweb.freebsd.org/changeset/base/365043
Log:
pw: Fix terminal handling when setting a group password.
Reported by: Coverity
MFC after:1 week
Sponsored by: NetApp, Inc.
Sponsored by: Klara, Inc.
Modified:
head/usr.sbin/pw/pw_group.c
Modified: head/usr.sbin/pw/pw_group.c
==
--- head/usr.sbin/pw/pw_group.c Tue Sep 1 14:58:57 2020(r365042)
+++ head/usr.sbin/pw/pw_group.c Tue Sep 1 15:14:13 2020(r365043)
@@ -66,13 +66,18 @@ grp_set_passwd(struct group *grp, bool update, int fd,
}
if ((istty = isatty(fd))) {
- n = t;
- /* Disable echo */
- n.c_lflag &= ~(ECHO);
- tcsetattr(fd, TCSANOW, );
- printf("%sassword for group %s:", update ? "New p" : "P",
- grp->gr_name);
- fflush(stdout);
+ if (tcgetattr(fd, ) == -1)
+ istty = 0;
+ else {
+ n = t;
+ /* Disable echo */
+ n.c_lflag &= ~(ECHO);
+ tcsetattr(fd, TCSANOW, );
+ printf("%sassword for group %s:",
+ update ? "New p" : "P",
+ grp->gr_name);
+ fflush(stdout);
+ }
}
b = read(fd, line, sizeof(line) - 1);
if (istty) {/* Restore state */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365042 - head/usr.sbin/ctld
Author: trasz
Date: Tue Sep 1 14:58:57 2020
New Revision: 365042
URL: https://svnweb.freebsd.org/changeset/base/365042
Log:
Make sure not to pass NULL to strtoul(3). The values come
from the kernel, but let's try to be on the safe side.
Reviewed by: mav
MFC after:2 weeks
Sponsored by: NetApp, Inc.
Sponsored by: Klara, Inc.
Differential Revision:https://reviews.freebsd.org/D26246
Modified:
head/usr.sbin/ctld/kernel.c
Modified: head/usr.sbin/ctld/kernel.c
==
--- head/usr.sbin/ctld/kernel.c Tue Sep 1 14:52:39 2020(r365041)
+++ head/usr.sbin/ctld/kernel.c Tue Sep 1 14:58:57 2020(r365042)
@@ -238,10 +238,16 @@ cctl_end_element(void *user_data, const char *name)
cur_lun->backend_type = str;
str = NULL;
} else if (strcmp(name, "lun_type") == 0) {
+ if (str == NULL)
+ log_errx(1, "%s: %s missing its argument", __func__,
name);
cur_lun->device_type = strtoull(str, NULL, 0);
} else if (strcmp(name, "size") == 0) {
+ if (str == NULL)
+ log_errx(1, "%s: %s missing its argument", __func__,
name);
cur_lun->size_blocks = strtoull(str, NULL, 0);
} else if (strcmp(name, "blocksize") == 0) {
+ if (str == NULL)
+ log_errx(1, "%s: %s missing its argument", __func__,
name);
cur_lun->blocksize = strtoul(str, NULL, 0);
} else if (strcmp(name, "serial_number") == 0) {
cur_lun->serial_number = str;
@@ -357,15 +363,23 @@ cctl_end_pelement(void *user_data, const char *name)
cur_port->port_name = str;
str = NULL;
} else if (strcmp(name, "physical_port") == 0) {
+ if (str == NULL)
+ log_errx(1, "%s: %s missing its argument", __func__,
name);
cur_port->pp = strtoul(str, NULL, 0);
} else if (strcmp(name, "virtual_port") == 0) {
+ if (str == NULL)
+ log_errx(1, "%s: %s missing its argument", __func__,
name);
cur_port->vp = strtoul(str, NULL, 0);
} else if (strcmp(name, "cfiscsi_target") == 0) {
cur_port->cfiscsi_target = str;
str = NULL;
} else if (strcmp(name, "cfiscsi_state") == 0) {
+ if (str == NULL)
+ log_errx(1, "%s: %s missing its argument", __func__,
name);
cur_port->cfiscsi_state = strtoul(str, NULL, 0);
} else if (strcmp(name, "cfiscsi_portal_group_tag") == 0) {
+ if (str == NULL)
+ log_errx(1, "%s: %s missing its argument", __func__,
name);
cur_port->cfiscsi_portal_group_tag = strtoul(str, NULL, 0);
} else if (strcmp(name, "ctld_portal_group_name") == 0) {
cur_port->ctld_portal_group_name = str;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365041 - head/usr.bin/diff
Author: bapt
Date: Tue Sep 1 14:52:39 2020
New Revision: 365041
URL: https://svnweb.freebsd.org/changeset/base/365041
Log:
diff: always properly kill pr(1)
When diff is invoked with -l it will spawn the pr(1) program.
In some circumpstances the pr(1) was not properly killed when diff program
exits.
Submitted by: Bret Ketchum
MFC after:3 days
Differential Revision:https://reviews.freebsd.org/D26232
Modified:
head/usr.bin/diff/diffreg.c
Modified: head/usr.bin/diff/diffreg.c
==
--- head/usr.bin/diff/diffreg.c Tue Sep 1 14:52:35 2020(r365040)
+++ head/usr.bin/diff/diffreg.c Tue Sep 1 14:52:39 2020(r365041)
@@ -412,10 +412,10 @@ diffreg(char *file1, char *file2, int flags, int capsi
ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew));
check(f1, f2, flags);
output(file1, f1, file2, f2, flags);
- if (pr != NULL)
- stop_pr(pr);
closem:
+ if (pr != NULL)
+ stop_pr(pr);
if (anychange) {
status |= 1;
if (rval == D_SAME)
@@ -1704,4 +1704,4 @@ print_space(int nc, int n, int flags) {
}
}
diff_output("%*s", col, "");
-}
\ No newline at end of file
+}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365040 - head/usr.sbin/iscsid
Author: trasz
Date: Tue Sep 1 14:52:35 2020
New Revision: 365040
URL: https://svnweb.freebsd.org/changeset/base/365040
Log:
Fix string overflow that could occur during redirection due to passing
the wrong length to strlcpy(3). It looks like it could overflow into
the next field, isc_user, which is properly long to accomodate for it;
I don't think it could cause any harm other than breaking the connection.
Reviewed by: mav
MFC after:2 weeks
Sponsored by: NetApp, Inc.
Sponsored by: Klara, Inc.
Differential Revision:https://reviews.freebsd.org/D26247
Modified:
head/usr.sbin/iscsid/login.c
Modified: head/usr.sbin/iscsid/login.c
==
--- head/usr.sbin/iscsid/login.cTue Sep 1 14:50:43 2020
(r365039)
+++ head/usr.sbin/iscsid/login.cTue Sep 1 14:52:35 2020
(r365040)
@@ -170,7 +170,7 @@ kernel_modify(const struct connection *conn, const cha
ism.ism_session_id = conn->conn_session_id;
memcpy(_conf, >conn_conf, sizeof(ism.ism_conf));
strlcpy(ism.ism_conf.isc_target_addr, target_address,
- sizeof(ism.ism_conf.isc_target));
+ sizeof(ism.ism_conf.isc_target_addr));
error = ioctl(conn->conn_iscsi_fd, ISCSISMODIFY, );
if (error != 0) {
log_err(1, "failed to redirect to %s: ISCSISMODIFY",
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365039 - head/sys/arm64/arm64
Author: andrew Date: Tue Sep 1 14:50:43 2020 New Revision: 365039 URL: https://svnweb.freebsd.org/changeset/base/365039 Log: Ensure the tlbi has completed before setting SCTLR When enabling the MMU on arm64 we need to ensure the tlb invalidation has completed before setting the enable bit in the SCTLR register. Reported by: alc Sponsored by: Innovate UK Modified: head/sys/arm64/arm64/locore.S Modified: head/sys/arm64/arm64/locore.S == --- head/sys/arm64/arm64/locore.S Tue Sep 1 13:58:17 2020 (r365038) +++ head/sys/arm64/arm64/locore.S Tue Sep 1 14:50:43 2020 (r365039) @@ -677,6 +677,8 @@ start_mmu: /* Invalidate the TLB */ tlbivmalle1is + dsb ish + isb ldr x2, mair msr mair_el1, x2 ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r364737 - head/sys/dev/drm2
On Tue, 1 Sep 2020 16:31:58 +0200 Niclas Zeising wrote: > On 2020-09-01 16:19, Emmanuel Vadot wrote: > > On Tue, 1 Sep 2020 15:32:18 +0200 > > Niclas Zeising wrote: > > > >> On 2020-09-01 15:16, Emmanuel Vadot wrote: > >>> On Tue, 1 Sep 2020 15:13:53 +0200 > >>> Michal Meloun wrote: > >>> > > > On 25.08.2020 0:53, Niclas Zeising wrote: > > Author: zeising (doc,ports committer) > > Date: Mon Aug 24 22:53:23 2020 > > New Revision: 364737 > > URL: https://svnweb.freebsd.org/changeset/base/364737 > > > > Log: > > drm2: Update deprecation message > > > > Update the deprecation message in the drm2 (aka legacy drm) drivers > > to point > > towards the graphics/drm-kmod ports for all architectures, not just > > amd64. > Only known user of drm2 is arm/tegra124 based boards. How > graphics/drm-kmod can help for these? > Or be more specific - drm2 allows me to hot-plug monitor to tegra based > board an use 2 scaled overlay planes (which is exactly whats I want for > my application). Which alternative can you offer me? > Btw, as you can see, the maintenance cost of drm2 is close to zero and > the dev/drm2 code does not inherit with any of the major architectures. > > Michal > >>> > >>>I think that the goal was only to mfc this to warn users before 12.2 > >>> is branched, maybe a direct commit to 12 would have been better. > >>> > >> > >> No, the change is correct. > >> drm-legacy-kmod (the port) is going away, especially on FreeBSD 13, > >> since it is preventing updates to the FreeBSD VM subsystem. I sent > >> an-email about this to a variety of lists about a week ago. > >> I do know that there are a few special users of drm2 in FreeBSD current, > >> I do not know how those are affected. Since, on FreeBSD current, most > >> architectures can use drm-kmod, I believe it is good to point everyone > >> towards that ports, instead of pointing everyone except amd64 users to > >> drm-legacy-kmod. > >> Regards > >> -- > >> Niclas Zeising > > > > drm2 in src is only used for arm, so as Michal wrote in another email > > the warning will be seen only for tegra users, the mfc'ed commit will > > be seen by intel/amd ones though. > > > > I still have to make a general change that can be MFCd. I think that for this case a direct commit to 12 would have been ok. > And pointing arm tegra users to drm-legacy-kmod is equally wrong. True, pointing them to any port is wrong anyway, none of them will work, it would be better to remove the warning now. > Regards > -- > Niclas Zeising -- Emmanuel Vadot ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r364737 - head/sys/dev/drm2
On 2020-09-01 16:19, Emmanuel Vadot wrote: On Tue, 1 Sep 2020 15:32:18 +0200 Niclas Zeising wrote: On 2020-09-01 15:16, Emmanuel Vadot wrote: On Tue, 1 Sep 2020 15:13:53 +0200 Michal Meloun wrote: On 25.08.2020 0:53, Niclas Zeising wrote: Author: zeising (doc,ports committer) Date: Mon Aug 24 22:53:23 2020 New Revision: 364737 URL: https://svnweb.freebsd.org/changeset/base/364737 Log: drm2: Update deprecation message Update the deprecation message in the drm2 (aka legacy drm) drivers to point towards the graphics/drm-kmod ports for all architectures, not just amd64. Only known user of drm2 is arm/tegra124 based boards. How graphics/drm-kmod can help for these? Or be more specific - drm2 allows me to hot-plug monitor to tegra based board an use 2 scaled overlay planes (which is exactly whats I want for my application). Which alternative can you offer me? Btw, as you can see, the maintenance cost of drm2 is close to zero and the dev/drm2 code does not inherit with any of the major architectures. Michal I think that the goal was only to mfc this to warn users before 12.2 is branched, maybe a direct commit to 12 would have been better. No, the change is correct. drm-legacy-kmod (the port) is going away, especially on FreeBSD 13, since it is preventing updates to the FreeBSD VM subsystem. I sent an-email about this to a variety of lists about a week ago. I do know that there are a few special users of drm2 in FreeBSD current, I do not know how those are affected. Since, on FreeBSD current, most architectures can use drm-kmod, I believe it is good to point everyone towards that ports, instead of pointing everyone except amd64 users to drm-legacy-kmod. Regards -- Niclas Zeising drm2 in src is only used for arm, so as Michal wrote in another email the warning will be seen only for tegra users, the mfc'ed commit will be seen by intel/amd ones though. I still have to make a general change that can be MFCd. And pointing arm tegra users to drm-legacy-kmod is equally wrong. Regards -- Niclas Zeising ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
