X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=rpikern;a=blobdiff_plain;f=src%2Fmain.c;h=a046c121efef19c376b9c1db6b321f73af95f6b8;hp=47e23b6ac347bd01e06f565951bae3f6f670b033;hb=311d50a18e3cdc236781882198671b4e1a538535;hpb=4cdb0feb633bc6181644704cea8f18368b5bcfd1

diff --git a/src/main.c b/src/main.c
index 47e23b6..a046c12 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,28 +38,95 @@
 #define PROP_CODE_REQ	0
 #define PROP_RESP_OK	0x80000000
 
-#define PROP_TAG_END		0
-#define PROP_TAG_BLANKSCR	0x40002
 
+#define PROP_TAG_END			0
+
+#define PROP_TAG_SET			0x08000
+#define PROP_TAG_TEST			0x04000
+#define PROP_TAG_GET			0
+
+#define PROP_TAG_ALLOCBUF		0x40001
+#define PROP_TAG_BLANKSCR		0x40002
+#define PROP_TAG_PHYSRES		0x40003
+#define PROP_TAG_VIRTRES		0x40004
+#define PROP_TAG_DEPTH			0x40005
+#define PROP_TAG_PIXEL_ORDER	0x40006
+#define PROP_TAG_ALPHA_MODE		0x40007
+#define PROP_TAG_PITCH			0x40008
+#define PROP_TAG_VOFFS			0x40009
+#define PROP_TAG_OVERSCAN		0x4000a
+#define PROP_TAG_PALETTE		0x4000b
+#define PROP_TAG_CUR_INFO		0x00010
+#define PROP_TAG_CUR_STATE		0x00011
+
+
+void panic(void);
 int prop_blankscr(int onoff);
+int prop_setres(int xsz, int ysz);
+int prop_getres(int *xsz, int *ysz);
+int prop_setvres(int xsz, int ysz);
+int prop_getvres(int *xsz, int *ysz);
+int prop_setdepth(int bpp);
+int prop_getdepth(void);
+int prop_getpitch(void);
+void *prop_allocbuf(int *size);
 
 uint32_t mb_read(int chan);
 void mb_write(int chan, uint32_t val);
 
+void dbgled(int x);
+void exit(int x);
+
 int main(void)
 {
-	prop_blankscr(1);
+	int i, j, bpp, fbsize, pitch;
+	uint16_t *fb;
+
+	if(prop_setres(640, 480) == -1) panic();
+	if(prop_setvres(640, 480) == -1) panic();
+	if(prop_setdepth(16) == -1) panic();
+	if(!(fb = prop_allocbuf(&fbsize))) panic();
+	bpp = prop_getdepth();
+	pitch = prop_getpitch();
+
+	if(bpp != 16) panic();
+
+	for(i=0; i<480; i++) {
+		for(j=0; j<640; j++) {
+			int xor = i ^ j;
+			int r = (xor >> 1) & 0xff;
+			int g = xor & 0xff;
+			int b = (xor << 1) & 0xff;
+
+			*fb++ = ((r << 8) & 0xf800) | ((g << 3) & 0x7e0) | ((b >> 3) & 0x1f);
+		}
+
+		//fb += pitch / 2 - 640;
+	}
 
 	return 0;
 }
 
+void panic(void)
+{
+	dbgled(2);
+	exit(0);
+}
+
 static uint32_t propbuf[64] __attribute__((aligned(16)));
 
+static int send_prop(uint32_t *buf)
+{
+	mb_write(MB_CHAN_PROP, (uint32_t)buf >> 4);
+	mb_read(MB_CHAN_PROP);
+	return propbuf[1] == PROP_RESP_OK ? 0 : -1;
+}
+
 int prop_blankscr(int onoff)
 {
 	uint32_t *pb = propbuf;
 
-	*pb++ = 0;
+	*pb++ = 32;
 	*pb++ = 0;
 	*pb++ = PROP_TAG_BLANKSCR;
 	*pb++ = 4;	/* data size */
@@ -67,12 +134,166 @@ int prop_blankscr(int onoff)
 	*pb++ = onoff ? 1 : 0;
 	*pb++ = PROP_TAG_END;
 	*pb++ = 0;	/* padding */
-	propbuf[0] = (char*)pb - (char*)propbuf;
 
-	mb_write(MB_CHAN_PROP, (uint32_t)propbuf >> 4);
-	mb_read(MB_CHAN_PROP);
+	return send_prop(propbuf);
+}
 
-	return propbuf[1] == PROP_RESP_OK ? 0 : -1;
+int prop_setres(int xsz, int ysz)
+{
+	uint32_t *pb = propbuf;
+
+	*pb++ = 32;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_PHYSRES | PROP_TAG_SET;
+	*pb++ = 8;	/* data size */
+	*pb++ = PROP_CODE_REQ;
+	*pb++ = xsz;
+	*pb++ = ysz;
+	*pb++ = PROP_TAG_END;
+
+	return send_prop(propbuf);
+}
+
+int prop_getres(int *xsz, int *ysz)
+{
+	uint32_t *pb = propbuf;
+	uint32_t *data;
+
+	*pb++ = 32;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_PHYSRES;
+	*pb++ = 8;
+	*pb++ = PROP_CODE_REQ;
+	data = pb;
+	*pb++ = 0;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_END;
+
+	if(send_prop(propbuf) == -1) {
+		return -1;
+	}
+	*xsz = data[0];
+	*ysz = data[1];
+	return 0;
+}
+
+int prop_setvres(int xsz, int ysz)
+{
+	uint32_t *pb = propbuf;
+
+	*pb++ = 32;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_VIRTRES | PROP_TAG_SET;
+	*pb++ = 8;	/* data size */
+	*pb++ = PROP_CODE_REQ;
+	*pb++ = xsz;
+	*pb++ = ysz;
+	*pb++ = PROP_TAG_END;
+
+	return send_prop(propbuf);
+}
+
+int prop_getvres(int *xsz, int *ysz)
+{
+	uint32_t *pb = propbuf;
+	uint32_t *data;
+
+	*pb++ = 32;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_VIRTRES;
+	*pb++ = 8;
+	*pb++ = PROP_CODE_REQ;
+	data = pb;
+	*pb++ = 0;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_END;
+
+	if(send_prop(propbuf) == -1) {
+		return -1;
+	}
+	*xsz = data[0];
+	*ysz = data[1];
+	return 0;
+}
+
+int prop_setdepth(int bpp)
+{
+	uint32_t *pb = propbuf;
+
+	*pb++ = 32;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_DEPTH | PROP_TAG_SET;
+	*pb++ = 4;
+	*pb++ = PROP_CODE_REQ;
+	*pb++ = bpp;
+	*pb++ = PROP_TAG_END;
+	*pb++ = 0;	/* padding */
+
+	return send_prop(propbuf);
+}
+
+int prop_getdepth(void)
+{
+	uint32_t *pb = propbuf;
+	uint32_t *data;
+
+	*pb++ = 32;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_DEPTH;
+	*pb++ = 4;	/* data size */
+	*pb++ = PROP_CODE_REQ;
+	data = pb;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_END;
+	*pb++ = 0;	/* padding */
+
+	if(send_prop(propbuf) == -1) {
+		return 0;
+	}
+	return *data;
+}
+
+int prop_getpitch(void)
+{
+	uint32_t *pb = propbuf;
+	uint32_t *data;
+
+	*pb++ = 32;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_PITCH;
+	*pb++ = 4;	/* data size */
+	*pb++ = PROP_CODE_REQ;
+	data = pb;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_END;
+	*pb++ = 0;	/* padding */
+
+	if(send_prop(propbuf) == -1) {
+		return 0;
+	}
+	return *data;
+}
+
+void *prop_allocbuf(int *size)
+{
+	uint32_t *pb = propbuf;
+	uint32_t *data;
+
+	*pb++ = 32;
+	*pb++ = 0;
+	*pb++ = PROP_TAG_ALLOCBUF;
+	*pb++ = 8;	/* data size */
+	*pb++ = PROP_CODE_REQ;
+	data = pb;
+	*pb++ = 16;	/* alignment */
+	*pb++ = 0;
+	*pb++ = PROP_TAG_END;
+
+	if(send_prop(propbuf) == -1) {
+		return 0;
+	}
+	*size = data[1];
+	return (void*)bus2phys(data[0]);
 }
 
 uint32_t mb_read(int chan)