Page MenuHomeFreeBSD
Files F151475825

D16600.id.diff
No OneTemporary
Actions

D16600.id.diff
View Options

Index: head/stand/i386/libi386/bioscd.c
===================================================================
--- head/stand/i386/libi386/bioscd.c
+++ head/stand/i386/libi386/bioscd.c
@@ -258,15 +258,9 @@
struct i386_devdesc *dev;
int unit;
int blks;
-#ifdef BD_SUPPORT_FRAGS
- char fragbuf[BIOSCD_SECSIZE];
- size_t fragsize;
- fragsize = size % BIOSCD_SECSIZE;
-#else
if (size % BIOSCD_SECSIZE)
return (EINVAL);
-#endif
if ((rw & F_MASK) != F_READ)
return(EROFS);
@@ -290,20 +284,6 @@
return (0);
}
}
-#ifdef BD_SUPPORT_FRAGS
- DEBUG("frag read %d from %lld+%d to %p",
- fragsize, dblk, blks, buf + (blks * BIOSCD_SECSIZE));
- if (fragsize && bc_read(unit, dblk + blks, 1, fragbuf) != 1) {
- if (blks) {
- if (rsize)
- *rsize = blks * BIOSCD_SECSIZE;
- return (0);
- }
- DEBUG("frag read error");
- return(EIO);
- }
- bcopy(fragbuf, buf + (blks * BIOSCD_SECSIZE), fragsize);
-#endif
if (rsize)
*rsize = size;
return (0);
Index: head/stand/i386/libi386/biosdisk.c
===================================================================
--- head/stand/i386/libi386/biosdisk.c
+++ head/stand/i386/libi386/biosdisk.c
@@ -451,17 +451,11 @@
struct disk_devdesc *dev = (struct disk_devdesc *)devdata;
uint64_t disk_blocks;
int blks, rc;
-#ifdef BD_SUPPORT_FRAGS /* XXX: sector size */
- char fragbuf[BIOSDISK_SECSIZE];
- size_t fragsize;
- fragsize = size % BIOSDISK_SECSIZE;
-#else
if (size % BD(dev).bd_sectorsize) {
panic("bd_strategy: %d bytes I/O not multiple of block size",
size);
}
-#endif
DEBUG("open_disk %p", dev);
@@ -520,15 +514,6 @@
}
return (EIO);
}
-#ifdef BD_SUPPORT_FRAGS /* XXX: sector size */
- DEBUG("bd_strategy: frag read %d from %d+%d to %p",
- fragsize, dblk, blks, buf + (blks * BIOSDISK_SECSIZE));
- if (fragsize && bd_read(od, dblk + blks, 1, fragsize)) {
- DEBUG("frag read error");
- return (EIO);
- }
- bcopy(fragbuf, buf + (blks * BIOSDISK_SECSIZE), fragsize);
-#endif
break;
case F_WRITE :
DEBUG("write %d from %lld to %p", blks, dblk, buf);
@@ -537,12 +522,6 @@
DEBUG("write error");
return (EIO);
}
-#ifdef BD_SUPPORT_FRAGS
- if (fragsize) {
- DEBUG("Attempted to write a frag");
- return (EIO);
- }
-#endif
break;
default:
/* DO NOTHING */

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 9, 4:10 PM (13 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31164345
Default Alt Text
D16600.id.diff (2 KB)

Event Timeline