1.1 --- a/stage2/jzlcd.h Wed Jun 28 00:20:14 2017 +0200
1.2 +++ b/stage2/jzlcd.h Wed Jun 28 01:04:22 2017 +0200
1.3 @@ -4,7 +4,7 @@
1.4 * Copyright (C) 2001 Wolfgang Denk, DENX Software Engineering, wd@denx.de.
1.5 * Copyright (C) 2005-2007, Ingenic Semiconductor Inc.
1.6 * Copyright (C) Xiangfu Liu <xiangfu@sharism.cc>
1.7 - * Copyright (C) 2015, 2016 Paul Boddie <paul@boddie.org.uk>
1.8 + * Copyright (C) 2015, 2016, 2017 Paul Boddie <paul@boddie.org.uk>
1.9 *
1.10 * This program is free software; you can redistribute it and/or
1.11 * modify it under the terms of the GNU General Public License as
1.12 @@ -25,10 +25,10 @@
1.13 #ifndef __JZLCD_H__
1.14 #define __JZLCD_H__
1.15
1.16 -#include "xburst_types.h"
1.17 +#include <stdint.h>
1.18
1.19 -void lcd_set_bpp(u8 bpp);
1.20 -unsigned long lcd_ctrl_init();
1.21 +void lcd_set_bpp(uint8_t bpp);
1.22 +uint32_t lcd_ctrl_init();
1.23 void lcd_enable();
1.24 void lcd_disable();
1.25
1.26 @@ -36,17 +36,17 @@
1.27 * Framebuffer characteristics
1.28 */
1.29 struct jzfb_info {
1.30 - unsigned int cfg; /* panel mode and pin usage etc. */
1.31 - unsigned int w;
1.32 - unsigned int h;
1.33 - unsigned int bpp; /* bit per pixel */
1.34 - unsigned int fclk; /* frame clk */
1.35 - unsigned int hsw; /* hsync width, in pclk */
1.36 - unsigned int vsw; /* vsync width, in line count */
1.37 - unsigned int elw; /* end of line, in pclk */
1.38 - unsigned int blw; /* begin of line, in pclk */
1.39 - unsigned int efw; /* end of frame, in line count */
1.40 - unsigned int bfw; /* begin of frame, in line count */
1.41 + uint32_t cfg; /* panel mode and pin usage etc. */
1.42 + uint32_t w;
1.43 + uint32_t h;
1.44 + uint32_t bpp; /* bit per pixel */
1.45 + uint32_t fclk; /* frame clk */
1.46 + uint32_t hsw; /* hsync width, in pclk */
1.47 + uint32_t vsw; /* vsync width, in line count */
1.48 + uint32_t elw; /* end of line, in pclk */
1.49 + uint32_t blw; /* begin of line, in pclk */
1.50 + uint32_t efw; /* end of frame, in line count */
1.51 + uint32_t bfw; /* begin of frame, in line count */
1.52 };
1.53
1.54 /*
1.55 @@ -54,9 +54,9 @@
1.56 */
1.57 struct jz_fb_dma_descriptor {
1.58 struct jz_fb_dma_descriptor *fdadr; /* Frame descriptor address register */
1.59 - unsigned long fsadr; /* Frame source address register */
1.60 - unsigned long fidr; /* Frame ID register */
1.61 - unsigned long ldcmd; /* Command register */
1.62 + uint32_t fsadr; /* Frame source address register */
1.63 + uint32_t fidr; /* Frame ID register */
1.64 + uint32_t ldcmd; /* Command register */
1.65 };
1.66
1.67 /*
1.68 @@ -72,17 +72,17 @@
1.69 struct jz_fb_dma_descriptor *dmadesc_fbhigh;
1.70 struct jz_fb_dma_descriptor *dmadesc_palette;
1.71
1.72 - unsigned long screen; /* address of frame buffer */
1.73 - unsigned long palette; /* address of palette memory */
1.74 + uint32_t screen; /* address of frame buffer */
1.75 + uint32_t palette; /* address of palette memory */
1.76 };
1.77
1.78 /*
1.79 * Concise display characteristics with low-level structure reference
1.80 */
1.81 typedef struct vidinfo {
1.82 - unsigned short vl_col; /* Number of columns (i.e. 640) */
1.83 - unsigned short vl_row; /* Number of rows (i.e. 480) */
1.84 - unsigned char vl_bpix; /* Bits per pixel, 0 = 1, 1 = 2, 2 = 4, 3 = 8 */
1.85 + uint16_t vl_col; /* Number of columns (i.e. 640) */
1.86 + uint16_t vl_row; /* Number of rows (i.e. 480) */
1.87 + uint8_t vl_bpix; /* Bits per pixel, 0 = 1, 1 = 2, 2 = 4, 3 = 8 */
1.88
1.89 struct jz_fb_info jz_fb;
1.90 } vidinfo_t;