[gnumach] 01/01: patches/git-cursor_init.patch: New patch to make sure cursor is initialized.

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository gnumach.

commit 0d4274be668a3b7f59989dc9b1c26dbdadaf6573
Author: Samuel Thibault <address@hidden>
Date:   Thu Jan 2 23:30:13 2014 +0100

    patches/git-cursor_init.patch: New patch to make sure cursor is initialized.
---
 debian/changelog                                   |  9 ++++
 debian/patches/git-cursor_init.patch               | 61 ++++++++++++++++++++++
 ..._data_size.patch => git-kentry_data_size.patch} |  0
 ...se.patch => git-thread_terminate_release.patch} |  0
 ...overflow.patch => git-xen_clock_overflow.patch} |  0
 debian/patches/series                              |  7 +--
 6 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ea8db3..ac8638d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnumach (2:1.4-3) UNRELEASED; urgency=medium
+
+  * patches/{kentry_data_size,thread_terminate_release,
+    xen_clock_overflow}.patch: Add "git-" prefix to patch name.
+  * patches/git-cursor_init.patch: New patch to make sure cursor is
+    initialized.
+
+ -- Samuel Thibault <address@hidden>  Thu, 02 Jan 2014 23:29:16 +0100
+
 gnumach (2:1.4-2) unstable; urgency=medium
 
   * control: Bump Standards-Version to 3.9.5 (no changes).
diff --git a/debian/patches/git-cursor_init.patch 
b/debian/patches/git-cursor_init.patch
new file mode 100644
index 0000000..def4141
--- /dev/null
+++ b/debian/patches/git-cursor_init.patch
@@ -0,0 +1,61 @@
+commit e1cd0a70ace0944a4916f8a152c50e366c2c6984
+Author: Samuel Thibault <address@hidden>
+Date:   Thu Jan 2 23:25:46 2014 +0100
+
+    Make sure cursor is initialized
+    
+    * i386/i386at/kd.c (kd_xga_init): Add start, stop variables, read them
+    from CRT registers, make sure the cursor is enabled and is not reduced
+    to 0, and write them back to CRT registers.
+    * i386/i386at/kd.h (C_START, C_STOP): New macros.
+
+diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
+index 3c66cc5..f70175c 100644
+--- a/i386/i386at/kd.c
++++ b/i386/i386at/kd.c
+@@ -2498,6 +2498,7 @@ kd_xga_init(void)
+ {
+       csrpos_t        xga_getpos();
+       unsigned char   screen;
++      unsigned char   start, stop;
+ 
+       outb(CMOS_ADDR, CMOS_EB);
+       screen = inb(CMOS_DATA) & CM_SCRMSK;
+@@ -2552,6 +2553,24 @@ kd_xga_init(void)
+               printf("kd: unknown screen type, defaulting to EGA\n");
+       }
+ 
++      outb(kd_index_reg, C_START);
++      start = inb(kd_io_reg);
++      /* Make sure cursor is enabled */
++      start &= ~0x20;
++      outb(kd_io_reg, start);
++      outb(kd_index_reg, C_STOP);
++      stop = inb(kd_io_reg);
++
++      if (!start && !stop)
++      {
++              /* Some firmware seem not to be initializing the cursor size
++               * any more...  Try using standard values.  */
++              outb(kd_index_reg, C_START);
++              outb(kd_io_reg, 14);
++              outb(kd_index_reg, C_STOP);
++              outb(kd_io_reg, 15);
++      }
++
+       kd_setpos(xga_getpos());
+ }
+ 
+diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h
+index 0907e23..6c869d6 100644
+--- a/i386/i386at/kd.h
++++ b/i386/i386at/kd.h
+@@ -113,6 +113,8 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ /*
+  * Commands sent to graphics adapter.
+  */
++#define C_START       0x0a            /* return cursor line start */
++#define C_STOP                0x0b            /* return cursor line stop */
+ #define C_LOW                 0x0f            /* return low byte of cursor 
addr */
+ #define C_HIGH                0x0e            /* high byte */
+ 
diff --git a/debian/patches/kentry_data_size.patch 
b/debian/patches/git-kentry_data_size.patch
similarity index 100%
rename from debian/patches/kentry_data_size.patch
rename to debian/patches/git-kentry_data_size.patch
diff --git a/debian/patches/thread_terminate_release.patch 
b/debian/patches/git-thread_terminate_release.patch
similarity index 100%
rename from debian/patches/thread_terminate_release.patch
rename to debian/patches/git-thread_terminate_release.patch
diff --git a/debian/patches/xen_clock_overflow.patch 
b/debian/patches/git-xen_clock_overflow.patch
similarity index 100%
rename from debian/patches/xen_clock_overflow.patch
rename to debian/patches/git-xen_clock_overflow.patch
diff --git a/debian/patches/series b/debian/patches/series
index f96d3fa..b41ca4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@
 60_bigmem.patch
 70_dde.patch
 80_missing_files.patch
-kentry_data_size.patch
-thread_terminate_release.patch
-xen_clock_overflow.patch
+git-kentry_data_size.patch
+git-thread_terminate_release.patch
+git-xen_clock_overflow.patch
+git-cursor_init.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/gnumach.git