Create device files /dev/sdNx.

Delete unused flash driver.
This commit is contained in:
Serge Vakulenko
2015-09-26 21:56:27 -07:00
parent 3073e9af87
commit fdb295ec25
4 changed files with 23 additions and 109 deletions

View File

@@ -1,2 +1,2 @@
/dev/rd0a / ufs rw,async 1 1 /dev/sd0a / ufs rw,async 1 1
#/dev/rd0c /u ufs rw,async 1 2 #/dev/sd0c /u ufs rw,async 1 2

View File

@@ -22,66 +22,36 @@ dir /u
# #
# Block devices. # Block devices.
# #
bdev /dev/rd0 bdev /dev/sd0
major 0 major 0
minor 0 minor 0
bdev /dev/rd0a bdev /dev/sd0a
major 0 major 0
minor 1 minor 1
bdev /dev/rd0b bdev /dev/sd0b
major 0 major 0
minor 2 minor 2
bdev /dev/rd0c bdev /dev/sd0c
major 0 major 0
minor 3 minor 3
bdev /dev/rd0d bdev /dev/sd0d
major 0 major 0
minor 4 minor 4
bdev /dev/rd1 bdev /dev/sd1
major 1 major 0
minor 0 minor 8
bdev /dev/rd1a bdev /dev/sd1a
major 1 major 0
minor 1 minor 9
bdev /dev/rd1b bdev /dev/sd1b
major 1 major 0
minor 2 minor 10
bdev /dev/rd1c bdev /dev/sd1c
major 1 major 0
minor 3 minor 11
bdev /dev/rd1d bdev /dev/sd1d
major 1 major 0
minor 4 minor 12
bdev /dev/rd2
major 2
minor 0
bdev /dev/rd2a
major 2
minor 1
bdev /dev/rd2b
major 2
minor 2
bdev /dev/rd2c
major 2
minor 3
bdev /dev/rd2d
major 2
minor 4
bdev /dev/rd3
major 3
minor 0
bdev /dev/rd3a
major 3
minor 1
bdev /dev/rd3b
major 3
minor 2
bdev /dev/rd3c
major 3
minor 3
bdev /dev/rd3d
major 3
minor 4
bdev /dev/swap bdev /dev/swap
major 4 major 4
minor 64 minor 64

View File

@@ -103,7 +103,7 @@ daddr_t nosize(dev)
* devices must be numbered from master 0 upwards. * devices must be numbered from master 0 upwards.
*/ */
const struct bdevsw bdevsw[] = { const struct bdevsw bdevsw[] = {
{ /* 0 - rd0 */ { /* 0 - sd */
#ifdef SD_ENABLED #ifdef SD_ENABLED
sdopen, sdclose, sdstrategy, sdopen, sdclose, sdstrategy,
sdsize, sdioctl, sddevs sdsize, sdioctl, sddevs

View File

@@ -1,56 +0,0 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/errno.h>
#include <sys/dk.h>
#include <sys/debug.h>
extern unsigned char flash_data[] asm("_binary_flash_img_start");
extern unsigned char flash_data_size[] asm("_binary_flash_img_size");
extern unsigned char flash_data_end[] asm("_binary_flash_img_end");
/*
* Query disk size, for swapping.
*/
daddr_t flash_size(int unit)
{
size_t fsize = (size_t)((void *)flash_data_size)>>10;
DEBUG3("flash%d: %u kbytes\n", unit, fsize);
return fsize;
}
int flash_open (int unit, int flag, int mode)
{
if (unit > 0)
return ENXIO;
return 0;
}
int flash_read(int unit, unsigned int offset, char *buf, unsigned int bcount)
{
unsigned int i;
if(unit>0)
return ENXIO;
offset = offset<<10;
if(!buf)
return 0;
for(i=0; i<bcount; i++)
buf[i] = flash_data[offset+i];
return 0;
}
int flash_write(int unit, unsigned int offset, char *buf, unsigned int bcount)
{
return 0;
}
void flash_init(int unit, int flag)
{
if(!(flag & S_SILENT)) printf("flash%d: %d bytes\n",unit,flash_size(unit)*1024);
flash_read(0,69,NULL,512);
}