mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 11/28] cbmbasic: clean up patches
Date: Sun, 30 Oct 2011 23:00:42 +0100	[thread overview]
Message-ID: <1320012059-24971-11-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 ...and-pseudo-timer-will-give-RND-functional.patch |   56 ++++++++++++++++++++
 patches/cbmbasic/add_iobase.diff                   |   48 -----------------
 patches/cbmbasic/series                            |    1 -
 3 files changed, 56 insertions(+), 49 deletions(-)
 create mode 100644 patches/cbmbasic/0001-Add-IOBASE-and-pseudo-timer-will-give-RND-functional.patch
 delete mode 100644 patches/cbmbasic/add_iobase.diff
 delete mode 100644 patches/cbmbasic/series

diff --git a/patches/cbmbasic/0001-Add-IOBASE-and-pseudo-timer-will-give-RND-functional.patch b/patches/cbmbasic/0001-Add-IOBASE-and-pseudo-timer-will-give-RND-functional.patch
new file mode 100644
index 0000000..21ebb33
--- /dev/null
+++ b/patches/cbmbasic/0001-Add-IOBASE-and-pseudo-timer-will-give-RND-functional.patch
@@ -0,0 +1,56 @@
+From f7cf261c349c0f511392ec061011ce0a84fbec0b Mon Sep 17 00:00:00 2001
+From: Wolfram Sang <ninja@the-dreams.de>
+Date: Sat, 29 Oct 2011 19:01:11 +0200
+Subject: [PATCH] Add IOBASE and pseudo-timer (will give RND-functionality)
+
+Signed-off-by: Wolfram Sang <ninja@the-dreams.de>
+
+# ---
+# 20091210 rsc: check if there is another upstream version
+# 20081127 wsa: already sent mainline and accepted.
+---
+ runtime.c |   14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/runtime.c b/runtime.c
+index 454000e..2c3c54b 100644
+--- a/runtime.c
++++ b/runtime.c
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <time.h>
+ 
+ unsigned char RAM[65536];
+ 
+@@ -155,6 +156,7 @@ init_os(int argc, char **argv) {
+ 		interactive = 1;
+ 		f = NULL;
+ 	}
++	srand(time(NULL));
+ }
+ 
+ static void
+@@ -565,8 +567,16 @@ PLOT() {
+ /* IOBASE */
+ static void
+ IOBASE() {
+-		printf("UNIMPL: IOBASE\n");
+-		exit(1);
++		/*
++		 * IOBASE is just used inside RND to get a timer value.
++		 * So, let's fake this here, too.
++		 */
++		int pseudo_timer = rand();
++		RAM[0xDC04] = pseudo_timer&0xff;
++		RAM[0xDC05] = pseudo_timer>>8;
++
++		X = 0x00;
++		Y = 0xDC;
+ }
+ 
+ int
+-- 
+1.7.7
+
diff --git a/patches/cbmbasic/add_iobase.diff b/patches/cbmbasic/add_iobase.diff
deleted file mode 100644
index 55628b6..0000000
--- a/patches/cbmbasic/add_iobase.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Subject: Add IOBASE and pseudo-timer (will give RND-functionality)
-From: Wolfram Sang <ninja@the-dreams.de>
-
-Signed-off-by: Wolfram Sang <ninja@the-dreams.de>
-
-# ---
-# 20091210 rsc: check if there is another upstream version
-# 20081127 wsa: already sent mainline and accepted.
-
-Index: basic/runtime.c
-===================================================================
---- basic.orig/runtime.c	2008-11-17 05:16:31.000000000 +0100
-+++ basic/runtime.c	2008-11-17 05:43:31.000000000 +0100
-@@ -29,6 +29,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <time.h>
- 
- unsigned char RAM[65536];
- 
-@@ -155,6 +156,7 @@
- 		interactive = 1;
- 		f = NULL;
- 	}
-+	srand(time(NULL));
- }
- 
- static void
-@@ -565,8 +567,16 @@
- /* IOBASE */
- static void
- IOBASE() {
--		printf("UNIMPL: IOBASE\n");
--		exit(1);
-+		/*
-+		 * IOBASE is just used inside RND to get a timer value.
-+		 * So, let's fake this here, too.
-+		 */
-+		int pseudo_timer = rand();
-+		RAM[0xDC04] = pseudo_timer&0xff;
-+		RAM[0xDC05] = pseudo_timer>>8;
-+
-+		X = 0x00;
-+		Y = 0xDC;
- }
- 
- int
diff --git a/patches/cbmbasic/series b/patches/cbmbasic/series
deleted file mode 100644
index a474bc9..0000000
--- a/patches/cbmbasic/series
+++ /dev/null
@@ -1 +0,0 @@
-add_iobase.diff
-- 
1.7.7


-- 
ptxdist mailing list
ptxdist@pengutronix.de

  parent reply	other threads:[~2011-10-30 22:00 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00   ` Robert Schwebel [this message]
2011-10-30 22:00   ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1320012059-24971-11-git-send-email-r.schwebel@pengutronix.de \
    --to=r.schwebel@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox