Merge branch 'ldlinux'

Conflicts:

	core/fs.c

diff --cc core/fs.c
index 35a11e9,1145949..ec81755
--- 1/core/fs.c
--- 2/core/fs.c
+++ b/core/fs.c
@@@ -117,16 -118,18 +117,17 @@@ struct device * device_init(uint8_t dev
       * it correctly.
       *
       */    
-     if ( USE_CACHE(dev.disk->disk_number) ) {
-         /* I can't use __lowmem here, 'cause it will cause the error:
 -    if ( USE_CACHE(dev->device_number) ) {
++    if (!cdrom) {
+         /* FIX!! 
+            I can't use __lowmem here, 'cause it will cause the error:
             "auxseg/lowmem region collides with xfer_buf_seg" */
          //static __lowmem char cache_buf[65536];
 -        dev->cache_data = core_cache_buf;
 -        dev->cache_size = sizeof core_cache_buf;
 +        dev.cache_data = core_cache_buf;
 +        dev.cache_size = sizeof core_cache_buf;
      } else 
 -        dev->cache_data = NULL;
 +        dev.cache_data = NULL;
  
 -    /* I just considered the floppy and disk now */
 -    dev->read_sectors = read_sectors;
 +    return &dev;
  }