svn commit: r262376 - in projects/clang-sparc64/sys: dev/esp dev/fb dev/mk48txx sparc64/isa sparc64/pci

Dimitry Andric dim at FreeBSD.org
Sun Feb 23 18:36:47 UTC 2014


Author: dim
Date: Sun Feb 23 18:36:45 2014
New Revision: 262376
URL: http://svnweb.freebsd.org/changeset/base/262376

Log:
  Remove more superfluous const specifiers.

Modified:
  projects/clang-sparc64/sys/dev/esp/esp_sbus.c
  projects/clang-sparc64/sys/dev/fb/creator.c
  projects/clang-sparc64/sys/dev/fb/machfb.c
  projects/clang-sparc64/sys/dev/mk48txx/mk48txx.c
  projects/clang-sparc64/sys/sparc64/isa/isa.c
  projects/clang-sparc64/sys/sparc64/pci/firereg.h

Modified: projects/clang-sparc64/sys/dev/esp/esp_sbus.c
==============================================================================
--- projects/clang-sparc64/sys/dev/esp/esp_sbus.c	Sun Feb 23 18:07:17 2014	(r262375)
+++ projects/clang-sparc64/sys/dev/esp/esp_sbus.c	Sun Feb 23 18:36:45 2014	(r262376)
@@ -165,7 +165,7 @@ static int	espattach(struct esp_softc *e
 		    const struct ncr53c9x_glue *gluep);
 static int	espdetach(struct esp_softc *esc);
 
-static const struct ncr53c9x_glue const esp_sbus_glue = {
+static const struct ncr53c9x_glue esp_sbus_glue = {
 	esp_read_reg,
 	esp_write_reg,
 	esp_dma_isintr,

Modified: projects/clang-sparc64/sys/dev/fb/creator.c
==============================================================================
--- projects/clang-sparc64/sys/dev/fb/creator.c	Sun Feb 23 18:07:17 2014	(r262375)
+++ projects/clang-sparc64/sys/dev/fb/creator.c	Sun Feb 23 18:36:45 2014	(r262376)
@@ -97,7 +97,7 @@ struct creator_softc {
 	bus_space_write_4((sc)->sc_bt[(reg)], (sc)->sc_bh[(reg)], (off), (val))
 
 #define	C(r, g, b)	((b << 16) | (g << 8) | (r))
-static const uint32_t const creator_cmap[] = {
+static const uint32_t creator_cmap[] = {
 	C(0x00, 0x00, 0x00),		/* black */
 	C(0x00, 0x00, 0xff),		/* blue */
 	C(0x00, 0xff, 0x00),		/* green */
@@ -121,7 +121,7 @@ static const struct {
 	vm_offset_t virt;
 	vm_paddr_t phys;
 	vm_size_t size;
-} const creator_fb_map[] = {
+} creator_fb_map[] = {
 	{ FFB_VIRT_SFB8R,	FFB_PHYS_SFB8R,		FFB_SIZE_SFB8R },
 	{ FFB_VIRT_SFB8G,	FFB_PHYS_SFB8G,		FFB_SIZE_SFB8G },
 	{ FFB_VIRT_SFB8B,	FFB_PHYS_SFB8B,		FFB_SIZE_SFB8B },
@@ -270,7 +270,7 @@ RENDERER(creator, 0, txtrndrsw, gfb_set)
 
 RENDERER_MODULE(creator, gfb_set);
 
-static const u_char const creator_mouse_pointer[64][8] __aligned(8) = {
+static const u_char creator_mouse_pointer[64][8] __aligned(8) = {
 	{ 0x00, 0x00, },	/* ............ */
 	{ 0x80, 0x00, },	/* *........... */
 	{ 0xc0, 0x00, },	/* **.......... */

Modified: projects/clang-sparc64/sys/dev/fb/machfb.c
==============================================================================
--- projects/clang-sparc64/sys/dev/fb/machfb.c	Sun Feb 23 18:07:17 2014	(r262375)
+++ projects/clang-sparc64/sys/dev/fb/machfb.c	Sun Feb 23 18:36:45 2014	(r262376)
@@ -131,7 +131,7 @@ static const struct {
 	uint16_t	chip_id;
 	const char	*name;
 	uint32_t	ramdac_freq;
-} const machfb_info[] = {
+} machfb_info[] = {
 	{ ATI_MACH64_CT, "ATI Mach64 CT", 135000 },
 	{ ATI_RAGE_PRO_AGP, "ATI 3D Rage Pro (AGP)", 230000 },
 	{ ATI_RAGE_PRO_AGP1X, "ATI 3D Rage Pro (AGP 1x)", 230000 },
@@ -169,7 +169,7 @@ static const struct machfb_cmap {
 	uint8_t red;
 	uint8_t green;
 	uint8_t blue;
-} const machfb_default_cmap[16] = {
+} machfb_default_cmap[16] = {
 	{0x00, 0x00, 0x00},	/* black */
 	{0x00, 0x00, 0xff},	/* blue */
 	{0x00, 0xff, 0x00},	/* green */
@@ -190,7 +190,7 @@ static const struct machfb_cmap {
 
 #define	MACHFB_CMAP_OFF		16
 
-static const u_char const machfb_mouse_pointer_bits[64][8] = {
+static const u_char machfb_mouse_pointer_bits[64][8] = {
 	{ 0x00, 0x00, },	/* ............ */
 	{ 0x80, 0x00, },	/* *........... */
 	{ 0xc0, 0x00, },	/* **.......... */
@@ -219,7 +219,7 @@ static const u_char const machfb_mouse_p
  * Lookup table to perform a bit-swap of the mouse pointer bits,
  * map set bits to CUR_CLR0 and unset bits to transparent.
  */
-static const u_char const machfb_mouse_pointer_lut[] = {
+static const u_char machfb_mouse_pointer_lut[] = {
 	0xaa, 0x2a, 0x8a, 0x0a, 0xa2, 0x22, 0x82, 0x02,
 	0xa8, 0x28, 0x88, 0x08, 0xa0, 0x20, 0x80, 0x00
 };
@@ -1418,7 +1418,7 @@ static int
 machfb_get_memsize(struct machfb_softc *sc)
 {
 	int tmp, memsize;
-	const int const mem_tab[] = {
+	const int mem_tab[] = {
 		512, 1024, 2048, 4096, 6144, 8192, 12288, 16384
 	};
 

Modified: projects/clang-sparc64/sys/dev/mk48txx/mk48txx.c
==============================================================================
--- projects/clang-sparc64/sys/dev/mk48txx/mk48txx.c	Sun Feb 23 18:07:17 2014	(r262375)
+++ projects/clang-sparc64/sys/dev/mk48txx/mk48txx.c	Sun Feb 23 18:36:45 2014	(r262376)
@@ -64,7 +64,7 @@ static const struct {
 	bus_size_t clkoff;
 	u_int flags;
 #define	MK48TXX_EXT_REGISTERS	1	/* Has extended register set. */
-} const mk48txx_models[] = {
+} mk48txx_models[] = {
 	{ "mk48t02", MK48T02_CLKSZ, MK48T02_CLKOFF, 0 },
 	{ "mk48t08", MK48T08_CLKSZ, MK48T08_CLKOFF, 0 },
 	{ "mk48t18", MK48T18_CLKSZ, MK48T18_CLKOFF, 0 },

Modified: projects/clang-sparc64/sys/sparc64/isa/isa.c
==============================================================================
--- projects/clang-sparc64/sys/sparc64/isa/isa.c	Sun Feb 23 18:07:17 2014	(r262375)
+++ projects/clang-sparc64/sys/sparc64/isa/isa.c	Sun Feb 23 18:36:45 2014	(r262376)
@@ -118,7 +118,7 @@ isa_init(device_t dev)
 static const struct {
 	const char	*const name;
 	uint32_t	id;
-} const ofw_isa_pnp_map[] = {
+} ofw_isa_pnp_map[] = {
 	{ "SUNW,lomh",	0x0000ae4e }, /* SUN0000 */
 	{ "dma",	0x0002d041 }, /* PNP0200 */
 	{ "floppy",	0x0007d041 }, /* PNP0700 */

Modified: projects/clang-sparc64/sys/sparc64/pci/firereg.h
==============================================================================
--- projects/clang-sparc64/sys/sparc64/pci/firereg.h	Sun Feb 23 18:07:17 2014	(r262375)
+++ projects/clang-sparc64/sys/sparc64/pci/firereg.h	Sun Feb 23 18:36:45 2014	(r262376)
@@ -922,7 +922,7 @@
 #define	FO_XBC_PRF_CNT_SHFT			0
 
 /* Lookup tables */
-const uint16_t const fire_freq_nak_tmr_thrs[6][4] = {
+const uint16_t fire_freq_nak_tmr_thrs[6][4] = {
 	{ 0x00ed, 0x049, 0x043, 0x030 },
 	{ 0x01a0, 0x076, 0x06b, 0x048 },
 	{ 0x022f, 0x09a, 0x056, 0x056 },
@@ -931,7 +931,7 @@ const uint16_t const fire_freq_nak_tmr_t
 	{ 0x102f, 0x41a, 0x216, 0x216 }
 };
 
-const uint16_t const fire_rply_tmr_thrs[6][4] = {
+const uint16_t fire_rply_tmr_thrs[6][4] = {
 	{ 0x0379, 0x112, 0x0fc, 0x0b4 },
 	{ 0x0618, 0x1BA, 0x192, 0x10e },
 	{ 0x0831, 0x242, 0x143, 0x143 },


More information about the svn-src-projects mailing list