From c6c4f88a069c439da5710c78e12b5f7719d47d7c Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Wed, 8 Feb 2017 13:30:33 +0100 Subject: [PATCH] fb_accel: Some renaming nevis => hd1 & apollo => hd2 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/f94afc1593d0a500694cebf71ca520967c7559b3 Author: Michael Liebmann Date: 2017-02-08 (Wed, 08 Feb 2017) --- src/driver/fb_accel_cs_hd1.cpp | 6 +++--- src/driver/fb_accel_cs_hd2.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/driver/fb_accel_cs_hd1.cpp b/src/driver/fb_accel_cs_hd1.cpp index 3cac06001..aae21d3ed 100644 --- a/src/driver/fb_accel_cs_hd1.cpp +++ b/src/driver/fb_accel_cs_hd1.cpp @@ -78,7 +78,7 @@ #define GXA_CFG_REG 0x0030 #define GXA_CFG2_REG 0x00FC -#define LOGTAG "[fb_accel_gxa] " +#define LOGTAG "[fb_accel_cs_hd1] " /* static unsigned int _read_gxa(volatile unsigned char *base_addr, unsigned int offset) { @@ -126,7 +126,7 @@ void CFbAccelCSHD1::waitForIdle(const char *func) CFbAccelCSHD1::CFbAccelCSHD1() { - fb_name = "Coolstream NEVIS GXA framebuffer"; + fb_name = "Coolstream HD1 framebuffer"; } void CFbAccelCSHD1::init(const char * const) @@ -363,7 +363,7 @@ int CFbAccelCSHD1::setMode(unsigned int, unsigned int, unsigned int) xRes = screeninfo.xres; yRes = screeninfo.yres; bpp = screeninfo.bits_per_pixel; - printf(LOGTAG "%dx%dx%d line length %d. using nevis gxa graphics accelerator.\n", xRes, yRes, bpp, stride); + printf(LOGTAG "%dx%dx%d line length %d. using hd1 graphics accelerator.\n", xRes, yRes, bpp, stride); int needmem = stride * yRes * 2; if (available >= needmem) { diff --git a/src/driver/fb_accel_cs_hd2.cpp b/src/driver/fb_accel_cs_hd2.cpp index 912a83bbe..6cb115dfc 100644 --- a/src/driver/fb_accel_cs_hd2.cpp +++ b/src/driver/fb_accel_cs_hd2.cpp @@ -1,6 +1,6 @@ /* Framebuffer acceleration hardware abstraction functions. - The hardware dependent acceleration functions for coolstream apollo graphic chips + The hardware dependent acceleration functions for coolstream hd2 graphic chips are represented in this class. (C) 2017 M. Liebmann @@ -43,11 +43,11 @@ #include #include -#define LOGTAG "[fb_accel_apollo] " +#define LOGTAG "[fb_accel_cs_hd2] " CFbAccelCSHD2::CFbAccelCSHD2() { - fb_name = "Coolstream APOLLO framebuffer"; + fb_name = "Coolstream HD2 framebuffer"; } /* @@ -218,7 +218,7 @@ int CFbAccelCSHD2::setMode(unsigned int, unsigned int, unsigned int) xRes = screeninfo.xres; yRes = screeninfo.yres; bpp = screeninfo.bits_per_pixel; - printf(LOGTAG "%dx%dx%d line length %d. using apollo graphics accelerator.\n", xRes, yRes, bpp, stride); + printf(LOGTAG "%dx%dx%d line length %d. using hd2 graphics accelerator.\n", xRes, yRes, bpp, stride); int needmem = stride * yRes * 2; if (available >= needmem) {