svn commit: r295201 - head/sys/arm/xscale/i8134x

Michal Meloun mmel at FreeBSD.org
Wed Feb 3 10:39:31 UTC 2016


Author: mmel
Date: Wed Feb  3 10:39:29 2016
New Revision: 295201
URL: https://svnweb.freebsd.org/changeset/base/295201

Log:
  ARM: Remove C++ comments erroneously committed  in r295200.

Modified:
  head/sys/arm/xscale/i8134x/i80321reg.h

Modified: head/sys/arm/xscale/i8134x/i80321reg.h
==============================================================================
--- head/sys/arm/xscale/i8134x/i80321reg.h	Wed Feb  3 09:15:44 2016	(r295200)
+++ head/sys/arm/xscale/i8134x/i80321reg.h	Wed Feb  3 10:39:29 2016	(r295201)
@@ -331,12 +331,12 @@
 #define	ICU_INT_bit26		26
 
 /* CPU_XSCALE_80321 */
-//#define	ICU_INT_SSP		25	/* SSP serial port */
+#define	ICU_INT_SSP		25	/* SSP serial port */
 
 #define	ICU_INT_MUE		24	/* msg unit error */
 
 /* CPU_XSCALE_80321 */
-//#define	ICU_INT_AAUE		23	/* AAU error */
+#define	ICU_INT_AAUE		23	/* AAU error */
 
 #define	ICU_INT_bit22		22
 #define	ICU_INT_DMA1E		21	/* DMA Ch 1 error */
@@ -355,8 +355,8 @@
 #define	ICU_INT_CPPM		8	/* core processor PMU */
 
 /* CPU_XSCALE_80321 */
-//#define	ICU_INT_AAU_EOC		7	/* AAU end-of-chain */
-//#define	ICU_INT_AAU_EOT		6	/* AAU end-of-transfer */
+#define	ICU_INT_AAU_EOC		7	/* AAU end-of-chain */
+#define	ICU_INT_AAU_EOT		6	/* AAU end-of-transfer */
 
 #define	ICU_INT_bit5		5
 #define	ICU_INT_bit4		4
@@ -366,11 +366,11 @@
 #define	ICU_INT_DMA0_EOT	0	/* DMA0 end-of-transfer */
 
 /* CPU_XSCALE_80321 */
-//#define	ICU_INT_HWMASK		(0xffffffff & \
-//					~((1 << ICU_INT_bit26) | \
-//					  (1 << ICU_INT_bit22) | \
-//					  (1 << ICU_INT_bit5)  | \
-//					  (1 << ICU_INT_bit4)))
+#define	ICU_INT_HWMASK		(0xffffffff & \
+					~((1 << ICU_INT_bit26) | \
+					  (1 << ICU_INT_bit22) | \
+					  (1 << ICU_INT_bit5)  | \
+					  (1 << ICU_INT_bit4)))
 
 /*
  * Peripheral Bus Interface Unit


More information about the svn-src-head mailing list