[syslinux:master] dos: Remove redundant data_segment() definition

syslinux-bot for H. Peter Anvin hpa at zytor.com
Fri Jan 17 17:09:02 PST 2014


Commit-ID:  69c272fa4b12775c51b1b86bf2720665ebf0f1a7
Gitweb:     http://www.syslinux.org/commit/69c272fa4b12775c51b1b86bf2720665ebf0f1a7
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Fri, 17 Jan 2014 17:06:35 -0800
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Fri, 17 Jan 2014 17:06:35 -0800

dos: Remove redundant data_segment() definition

The definition for data_segment() was exactly the same as ds().

Signed-off-by: H. Peter Anvin <hpa at zytor.com>

---
 dos/syslinux.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/dos/syslinux.c b/dos/syslinux.c
index 8e856d4..3c45f34 100644
--- a/dos/syslinux.c
+++ b/dos/syslinux.c
@@ -170,15 +170,6 @@ ssize_t write_file(int fd, const void *buf, size_t count)
     return done;
 }
 
-static inline __attribute__ ((const))
-uint16_t data_segment(void)
-{
-    uint16_t ds;
-
-    asm("movw %%ds,%0" : "=rm"(ds));
-    return ds;
-}
-
 void write_device(int drive, const void *buf, size_t nsecs, unsigned int sector)
 {
     uint16_t errnum = 0x0001;
@@ -189,7 +180,7 @@ void write_device(int drive, const void *buf, size_t nsecs, unsigned int sector)
     dio.startsector = sector;
     dio.sectors = nsecs;
     dio.bufoffs = (uintptr_t) buf;
-    dio.bufseg = data_segment();
+    dio.bufseg = ds();
 
     if (dos_version >= 0x070a) {
 	/* Try FAT32-aware system call first */
@@ -222,7 +213,7 @@ void read_device(int drive, void *buf, size_t nsecs, unsigned int sector)
     dio.startsector = sector;
     dio.sectors = nsecs;
     dio.bufoffs = (uintptr_t) buf;
-    dio.bufseg = data_segment();
+    dio.bufseg = ds();
 
     if (dos_version >= 0x070a) {
 	/* Try FAT32-aware system call first */
@@ -322,7 +313,7 @@ void write_mbr(int drive, const void *buf)
     dprintf("write_mbr(%d,%p)", drive, buf);
 
     mbr.bufferoffset = (uintptr_t) buf;
-    mbr.bufferseg = data_segment();
+    mbr.bufferseg = ds();
 
     rv = 0x440d;
     asm volatile ("int $0x21 ; setc %0" : "=bcdm" (err), "+a"(rv)
@@ -351,7 +342,7 @@ void read_mbr(int drive, const void *buf)
     dprintf("read_mbr(%d,%p)", drive, buf);
 
     mbr.bufferoffset = (uintptr_t) buf;
-    mbr.bufferseg = data_segment();
+    mbr.bufferseg = ds();
 
     rv = 0x440d;
     asm volatile ("int $0x21 ; setc %0":"=abcdm" (err), "+a"(rv)


More information about the Syslinux-commits mailing list