Module Name: src
Committed By: jmcneill
Date: Sun Oct 18 14:00:08 UTC 2020
Modified Files:
src/sys/arch/arm/sunxi: sunxi_mixer.c
Log Message:
Treat ARGB/XRGB as BGRA/BGRX on big endian kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/sunxi/sunxi_mixer.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_mixer.c
diff -u src/sys/arch/arm/sunxi/sunxi_mixer.c:1.11 src/sys/arch/arm/sunxi/sunxi_mixer.c:1.12
--- src/sys/arch/arm/sunxi/sunxi_mixer.c:1.11 Sun Feb 9 15:22:25 2020
+++ src/sys/arch/arm/sunxi/sunxi_mixer.c Sun Oct 18 14:00:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mixer.c,v 1.11 2020/02/09 15:22:25 jakllsch Exp $ */
+/* $NetBSD: sunxi_mixer.c,v 1.12 2020/10/18 14:00:08 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mixer.c,v 1.11 2020/02/09 15:22:25 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mixer.c,v 1.12 2020/10/18 14:00:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -99,8 +99,13 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_mixer.
#define OVL_V_ATTCTL_LAY_FBFMT_YUV422 0x06
#define OVL_V_ATTCTL_LAY_FBFMT_YUV420 0x0a
#define OVL_V_ATTCTL_LAY_FBFMT_YUV411 0x0e
+#if BYTE_ORDER == BIG_ENDIAN
+#define OVL_V_ATTCTL_LAY_FBFMT_ARGB_8888 0x03
+#define OVL_V_ATTCTL_LAY_FBFMT_XRGB_8888 0x07
+#else
#define OVL_V_ATTCTL_LAY_FBFMT_ARGB_8888 0x00
#define OVL_V_ATTCTL_LAY_FBFMT_XRGB_8888 0x04
+#endif
#define OVL_V_ATTCTL_LAY0_EN __BIT(0)
#define OVL_V_MBSIZE(n) (0x004 + (n) * 0x30)
#define OVL_V_COOR(n) (0x008 + (n) * 0x30)
@@ -124,8 +129,13 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_mixer.
/* OVL_UI registers */
#define OVL_UI_ATTR_CTL(n) (0x000 + (n) * 0x20)
#define OVL_UI_ATTR_CTL_LAY_FBFMT __BITS(12,8)
+#if BYTE_ORDER == BIG_ENDIAN
+#define OVL_UI_ATTR_CTL_LAY_FBFMT_ARGB_8888 0x03
+#define OVL_UI_ATTR_CTL_LAY_FBFMT_XRGB_8888 0x07
+#else
#define OVL_UI_ATTR_CTL_LAY_FBFMT_ARGB_8888 0x00
#define OVL_UI_ATTR_CTL_LAY_FBFMT_XRGB_8888 0x04
+#endif
#define OVL_UI_ATTR_CTL_LAY_EN __BIT(0)
#define OVL_UI_MBSIZE(n) (0x004 + (n) * 0x20)
#define OVL_UI_COOR(n) (0x008 + (n) * 0x20)
