Skip to content

Commit

Permalink
staging: fbtft: Do not use binary constants
Browse files Browse the repository at this point in the history 
Gcc < 4.3 doesn't understand binary constants (0b*):

drivers/staging/fbtft/fbtft-sysfs.c:156:19: error: invalid suffix "b111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:3: error: invalid suffix "b1111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:11: error: invalid suffix "b1111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:19: error: invalid suffix "b11111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:28: error: invalid suffix "b1111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:36: error: invalid suffix "b1111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:44: error: invalid suffix "b1111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:159:52: error: invalid suffix "b11111" on integer constant
drivers/staging/fbtft/fb_hx8340bn.c:160:3: error: invalid suffix "b111" on integer constant
...

Hence use hexadecimal constants (0x*) instead.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Geert Uytterhoeven authored and Greg Kroah-Hartman committed Mar 24, 2015
1 parent dc5f2c5 commit 153fe94
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 49 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/fbtft/fb_hx8340bn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ static int set_var(struct fbtft_par *par)
static int set_gamma(struct fbtft_par *par, unsigned long *curves)
{
unsigned long mask[] = {
0b1111, 0b1111, 0b11111, 0b1111, 0b1111, 0b1111, 0b11111,
0b111, 0b111, 0b111, 0b111, 0b111, 0b111, 0b11, 0b11,
0b1111, 0b1111, 0b11111, 0b1111, 0b1111, 0b1111, 0b11111,
0b111, 0b111, 0b111, 0b111, 0b111, 0b111, 0b0, 0b0 };
0x0f, 0x0f, 0x1f, 0x0f, 0x0f, 0x0f, 0x1f, 0x07, 0x07, 0x07,
0x07, 0x07, 0x07, 0x03, 0x03, 0x0f, 0x0f, 0x1f, 0x0f, 0x0f,
0x0f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00,
};
int i, j;

/* apply mask */
Expand Down
7 changes: 3 additions & 4 deletions drivers/staging/fbtft/fb_hx8347d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,9 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
static int set_gamma(struct fbtft_par *par, unsigned long *curves)
{
unsigned long mask[] = {
0b111111, 0b111111, 0b111111, 0b111111, 0b111111, 0b111111,
0b1111111, 0b1111111,
0b11111, 0b11111, 0b11111, 0b11111, 0b11111,
0b1111};
0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x1f, 0x1f,
0x1f, 0x1f, 0x1f, 0x0f,
};
int i, j;
int acc = 0;

Expand Down
7 changes: 3 additions & 4 deletions drivers/staging/fbtft/fb_ili9320.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,9 @@ static int set_var(struct fbtft_par *par)
static int set_gamma(struct fbtft_par *par, unsigned long *curves)
{
unsigned long mask[] = {
0b11111, 0b11111, 0b111, 0b111, 0b111,
0b111, 0b111, 0b111, 0b111, 0b111,
0b11111, 0b11111, 0b111, 0b111, 0b111,
0b111, 0b111, 0b111, 0b111, 0b111 };
0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
};
int i, j;

fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
Expand Down
27 changes: 13 additions & 14 deletions drivers/staging/fbtft/fb_ili9325.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ static unsigned bt = 6; /* VGL=Vci*4 , VGH=Vci*4 */
module_param(bt, uint, 0);
MODULE_PARM_DESC(bt, "Sets the factor used in the step-up circuits");

static unsigned vc = 0b011; /* Vci1=Vci*0.80 */
static unsigned vc = 0x03; /* Vci1=Vci*0.80 */
module_param(vc, uint, 0);
MODULE_PARM_DESC(vc,
"Sets the ratio factor of Vci to generate the reference voltages Vci1");

static unsigned vrh = 0b1101; /* VREG1OUT=Vci*1.85 */
static unsigned vrh = 0x0d; /* VREG1OUT=Vci*1.85 */
module_param(vrh, uint, 0);
MODULE_PARM_DESC(vrh,
"Set the amplifying rate (1.6 ~ 1.9) of Vci applied to output the VREG1OUT");

static unsigned vdv = 0b10010; /* VCOMH amplitude=VREG1OUT*0.98 */
static unsigned vdv = 0x12; /* VCOMH amplitude=VREG1OUT*0.98 */
module_param(vdv, uint, 0);
MODULE_PARM_DESC(vdv,
"Select the factor of VREG1OUT to set the amplitude of Vcom");

static unsigned vcm = 0b001010; /* VCOMH=VREG1OUT*0.735 */
static unsigned vcm = 0x0a; /* VCOMH=VREG1OUT*0.735 */
module_param(vcm, uint, 0);
MODULE_PARM_DESC(vcm, "Set the internal VcomH voltage");

Expand Down Expand Up @@ -108,11 +108,11 @@ static int init_display(struct fbtft_par *par)
if (par->gpio.cs != -1)
gpio_set_value(par->gpio.cs, 0); /* Activate chip */

bt &= 0b111;
vc &= 0b111;
vrh &= 0b1111;
vdv &= 0b11111;
vcm &= 0b111111;
bt &= 0x07;
vc &= 0x07;
vrh &= 0x0f;
vdv &= 0x1f;
vcm &= 0x3f;

/* Initialization sequence from ILI9325 Application Notes */

Expand All @@ -137,7 +137,7 @@ static int init_display(struct fbtft_par *par)
write_reg(par, 0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */
mdelay(200); /* Dis-charge capacitor power voltage */
write_reg(par, 0x0010, /* SAP, BT[3:0], AP, DSTB, SLP, STB */
(1 << 12) | (bt << 8) | (1 << 7) | (0b001 << 4));
(1 << 12) | (bt << 8) | (1 << 7) | (0x01 << 4));
write_reg(par, 0x0011, 0x220 | vc); /* DC1[2:0], DC0[2:0], VC[2:0] */
mdelay(50); /* Delay 50ms */
write_reg(par, 0x0012, vrh); /* Internal reference voltage= Vci; */
Expand Down Expand Up @@ -233,10 +233,9 @@ static int set_var(struct fbtft_par *par)
static int set_gamma(struct fbtft_par *par, unsigned long *curves)
{
unsigned long mask[] = {
0b11111, 0b11111, 0b111, 0b111, 0b111,
0b111, 0b111, 0b111, 0b111, 0b111,
0b11111, 0b11111, 0b111, 0b111, 0b111,
0b111, 0b111, 0b111, 0b111, 0b111 };
0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
};
int i, j;

fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
Expand Down
10 changes: 4 additions & 6 deletions drivers/staging/fbtft/fb_s6d1121.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,10 @@ static int set_var(struct fbtft_par *par)
static int set_gamma(struct fbtft_par *par, unsigned long *curves)
{
unsigned long mask[] = {
0b111111, 0b111111, 0b111111, 0b111111, 0b111111, 0b111111,
0b111111, 0b111111, 0b111111, 0b111111, 0b111111, 0b111111,
0b11111, 0b11111,
0b111111, 0b111111, 0b111111, 0b111111, 0b111111, 0b111111,
0b111111, 0b111111, 0b111111, 0b111111, 0b111111, 0b111111,
0b11111, 0b11111 };
0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
0x3f, 0x3f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f,
};
int i, j;

fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
Expand Down
15 changes: 7 additions & 8 deletions drivers/staging/fbtft/fb_ssd1289.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,16 +126,16 @@ static int set_var(struct fbtft_par *par)

switch (par->info->var.rotate) {
case 0:
write_reg(par, 0x11, reg11 | 0b110000);
write_reg(par, 0x11, reg11 | 0x30);
break;
case 270:
write_reg(par, 0x11, reg11 | 0b101000);
write_reg(par, 0x11, reg11 | 0x28);
break;
case 180:
write_reg(par, 0x11, reg11 | 0b000000);
write_reg(par, 0x11, reg11 | 0x00);
break;
case 90:
write_reg(par, 0x11, reg11 | 0b011000);
write_reg(par, 0x11, reg11 | 0x18);
break;
}

Expand All @@ -151,10 +151,9 @@ static int set_var(struct fbtft_par *par)
static int set_gamma(struct fbtft_par *par, unsigned long *curves)
{
unsigned long mask[] = {
0b11111, 0b11111, 0b111, 0b111, 0b111,
0b111, 0b111, 0b111, 0b111, 0b111,
0b11111, 0b11111, 0b111, 0b111, 0b111,
0b111, 0b111, 0b111, 0b111, 0b111 };
0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
0x1f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
};
int i, j;

fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/fbtft/fb_ssd1351.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ static int set_var(struct fbtft_par *par)

switch (par->info->var.rotate) {
case 0:
write_reg(par, 0xA0, remap | 0b00 | 1<<4);
write_reg(par, 0xA0, remap | 0x00 | 1<<4);
break;
case 270:
write_reg(par, 0xA0, remap | 0b11 | 1<<4);
write_reg(par, 0xA0, remap | 0x03 | 1<<4);
break;
case 180:
write_reg(par, 0xA0, remap | 0b10);
write_reg(par, 0xA0, remap | 0x02);
break;
case 90:
write_reg(par, 0xA0, remap | 0b01);
write_reg(par, 0xA0, remap | 0x01);
break;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/fbtft/fb_st7735r.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ static int set_gamma(struct fbtft_par *par, unsigned long *curves)
/* apply mask */
for (i = 0; i < par->gamma.num_curves; i++)
for (j = 0; j < par->gamma.num_values; j++)
CURVE(i, j) &= 0b111111;
CURVE(i, j) &= 0x3f;

for (i = 0; i < par->gamma.num_curves; i++)
write_reg(par, 0xE0 + i,
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/fbtft/fbtft-sysfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ static struct device_attribute gamma_device_attrs[] = {

void fbtft_expand_debug_value(unsigned long *debug)
{
switch (*debug & 0b111) {
switch (*debug & 0x7) {
case 1:
*debug |= DEBUG_LEVEL_1;
break;
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/fbtft/fbtft_device.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ static struct fbtft_device_display displays[] = {
.buswidth = 8,
.backlight = 1,
},
.startbyte = 0b01110000,
.startbyte = 0x70,
.bgr = true,
.gpios = (const struct fbtft_gpio []) {
{ "reset", 25 },
Expand All @@ -510,7 +510,7 @@ static struct fbtft_device_display displays[] = {
.backlight = 1,
.init_sequence = hy28b_init_sequence,
},
.startbyte = 0b01110000,
.startbyte = 0x70,
.bgr = true,
.fps = 50,
.gpios = (const struct fbtft_gpio []) {
Expand Down Expand Up @@ -623,7 +623,7 @@ static struct fbtft_device_display displays[] = {
.buswidth = 8,
.backlight = 1,
},
.startbyte = 0b01110000,
.startbyte = 0x70,
.bgr = true,
.gpios = (const struct fbtft_gpio []) {
{ "reset", 25 },
Expand Down

0 comments on commit 153fe94

Please sign in to comment.