From owner-svn-src-head@FreeBSD.ORG Thu Jun 26 17:26:34 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8A9E2FB7; Thu, 26 Jun 2014 17:26:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 776CB2468; Thu, 26 Jun 2014 17:26:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QHQYZY008592; Thu, 26 Jun 2014 17:26:34 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QHQYb0008591; Thu, 26 Jun 2014 17:26:34 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201406261726.s5QHQYb0008591@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Thu, 26 Jun 2014 17:26:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267923 - head/sys/dev/netfpga10g/nf10bmac X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2014 17:26:34 -0000 Author: bz Date: Thu Jun 26 17:26:33 2014 New Revision: 267923 URL: http://svnweb.freebsd.org/changeset/base/267923 Log: Fix whitspace indentation from spaces to tabs. No functional changes. MFC after: 2 weeks Modified: head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c Modified: head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c ============================================================================== --- head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c Thu Jun 26 17:20:45 2014 (r267922) +++ head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c Thu Jun 26 17:26:33 2014 (r267923) @@ -92,78 +92,78 @@ nf10bmac_attach_fdt(device_t dev) * LOOP memory region (this could be a general control region). * 0x00: 32/64bit register to enable a Y-"lopback". */ - sc->nf10bmac_ctrl_rid = 0; - sc->nf10bmac_ctrl_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &sc->nf10bmac_ctrl_rid, RF_ACTIVE); - if (sc->nf10bmac_ctrl_res == NULL) { - device_printf(dev, "failed to map memory for CTRL region\n"); - error = ENXIO; - goto err; - } - if (bootverbose) - device_printf(sc->nf10bmac_dev, "CTRL region at mem %p-%p\n", - (void *)rman_get_start(sc->nf10bmac_ctrl_res), - (void *)(rman_get_start(sc->nf10bmac_ctrl_res) + - rman_get_size(sc->nf10bmac_ctrl_res))); - - /* - * TX and TX metadata FIFO memory region. - * 0x00: 32/64bit FIFO data, + sc->nf10bmac_ctrl_rid = 0; + sc->nf10bmac_ctrl_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->nf10bmac_ctrl_rid, RF_ACTIVE); + if (sc->nf10bmac_ctrl_res == NULL) { + device_printf(dev, "failed to map memory for CTRL region\n"); + error = ENXIO; + goto err; + } + if (bootverbose) + device_printf(sc->nf10bmac_dev, "CTRL region at mem %p-%p\n", + (void *)rman_get_start(sc->nf10bmac_ctrl_res), + (void *)(rman_get_start(sc->nf10bmac_ctrl_res) + + rman_get_size(sc->nf10bmac_ctrl_res))); + + /* + * TX and TX metadata FIFO memory region. + * 0x00: 32/64bit FIFO data, * 0x08: 32/64bit FIFO metadata, - * 0x10: 32/64bit packet length. - */ - sc->nf10bmac_tx_mem_rid = 1; - sc->nf10bmac_tx_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &sc->nf10bmac_tx_mem_rid, RF_ACTIVE); - if (sc->nf10bmac_tx_mem_res == NULL) { - device_printf(dev, "failed to map memory for TX FIFO\n"); - error = ENXIO; - goto err; - } - if (bootverbose) - device_printf(sc->nf10bmac_dev, "TX FIFO at mem %p-%p\n", - (void *)rman_get_start(sc->nf10bmac_tx_mem_res), - (void *)(rman_get_start(sc->nf10bmac_tx_mem_res) + - rman_get_size(sc->nf10bmac_tx_mem_res))); - - /* - * RX and RXC metadata FIFO memory region. - * 0x00: 32/64bit FIFO data, + * 0x10: 32/64bit packet length. + */ + sc->nf10bmac_tx_mem_rid = 1; + sc->nf10bmac_tx_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->nf10bmac_tx_mem_rid, RF_ACTIVE); + if (sc->nf10bmac_tx_mem_res == NULL) { + device_printf(dev, "failed to map memory for TX FIFO\n"); + error = ENXIO; + goto err; + } + if (bootverbose) + device_printf(sc->nf10bmac_dev, "TX FIFO at mem %p-%p\n", + (void *)rman_get_start(sc->nf10bmac_tx_mem_res), + (void *)(rman_get_start(sc->nf10bmac_tx_mem_res) + + rman_get_size(sc->nf10bmac_tx_mem_res))); + + /* + * RX and RXC metadata FIFO memory region. + * 0x00: 32/64bit FIFO data, * 0x08: 32/64bit FIFO metadata, - * 0x10: 32/64bit packet length. - */ - sc->nf10bmac_rx_mem_rid = 2; - sc->nf10bmac_rx_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &sc->nf10bmac_rx_mem_rid, RF_ACTIVE); - if (sc->nf10bmac_rx_mem_res == NULL) { - device_printf(dev, "failed to map memory for RX FIFO\n"); - error = ENXIO; - goto err; - } - if (bootverbose) - device_printf(sc->nf10bmac_dev, "RX FIFO at mem %p-%p\n", - (void *)rman_get_start(sc->nf10bmac_rx_mem_res), - (void *)(rman_get_start(sc->nf10bmac_rx_mem_res) + - rman_get_size(sc->nf10bmac_rx_mem_res))); + * 0x10: 32/64bit packet length. + */ + sc->nf10bmac_rx_mem_rid = 2; + sc->nf10bmac_rx_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->nf10bmac_rx_mem_rid, RF_ACTIVE); + if (sc->nf10bmac_rx_mem_res == NULL) { + device_printf(dev, "failed to map memory for RX FIFO\n"); + error = ENXIO; + goto err; + } + if (bootverbose) + device_printf(sc->nf10bmac_dev, "RX FIFO at mem %p-%p\n", + (void *)rman_get_start(sc->nf10bmac_rx_mem_res), + (void *)(rman_get_start(sc->nf10bmac_rx_mem_res) + + rman_get_size(sc->nf10bmac_rx_mem_res))); /* * Interrupt handling registers. * 0x00: 32/64bit register to clear (and disable) the RX interrupt. * 0x08: 32/64bit register to enable or disable the RX interrupt. */ - sc->nf10bmac_intr_rid = 3; - sc->nf10bmac_intr_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, - &sc->nf10bmac_intr_rid, RF_ACTIVE); - if (sc->nf10bmac_intr_res == NULL) { - device_printf(dev, "failed to map memory for INTR region\n"); - error = ENXIO; - goto err; - } - if (bootverbose) - device_printf(sc->nf10bmac_dev, "INTR region at mem %p-%p\n", - (void *)rman_get_start(sc->nf10bmac_intr_res), - (void *)(rman_get_start(sc->nf10bmac_intr_res) + - rman_get_size(sc->nf10bmac_intr_res))); + sc->nf10bmac_intr_rid = 3; + sc->nf10bmac_intr_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &sc->nf10bmac_intr_rid, RF_ACTIVE); + if (sc->nf10bmac_intr_res == NULL) { + device_printf(dev, "failed to map memory for INTR region\n"); + error = ENXIO; + goto err; + } + if (bootverbose) + device_printf(sc->nf10bmac_dev, "INTR region at mem %p-%p\n", + (void *)rman_get_start(sc->nf10bmac_intr_res), + (void *)(rman_get_start(sc->nf10bmac_intr_res) + + rman_get_size(sc->nf10bmac_intr_res))); /* (Optional) RX and TX IRQ. */ sc->nf10bmac_rx_irq_rid = 0;