diff options
| author | cinap_lenrek <cinap_lenrek@localhost> | 2011-04-15 07:25:45 +0000 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@localhost> | 2011-04-15 07:25:45 +0000 |
| commit | 856aeaf3333408c62b7627144e2bfd39fdf525d7 (patch) | |
| tree | b86c78d023cfda477bc06f949c9a3371bea9acab /sys | |
| parent | 74dd2ac7cd5b91e101be062084078446a9f53898 (diff) | |
let the kernel set dma mode for ata by default
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/lib/dist/pc/plan9.ini.cd | 6 | ||||
| -rw-r--r-- | sys/src/9/pc/sdata.c | 3 | ||||
| -rw-r--r-- | sys/src/boot/pc/mkfile | 12 |
3 files changed, 5 insertions, 16 deletions
diff --git a/sys/lib/dist/pc/plan9.ini.cd b/sys/lib/dist/pc/plan9.ini.cd index de8c1352f..90f8fda9e 100644 --- a/sys/lib/dist/pc/plan9.ini.cd +++ b/sys/lib/dist/pc/plan9.ini.cd @@ -2,17 +2,11 @@ # very cautious settings to get started. # will defeat booting from usb devices. *nomp=1 -# *noahciload=1 -# *debugload=1 *nodumpstack=1 -# this would disable ether and usb probing. -# *nousbprobe=1 -# *noetherprobe=1 partition=new mouseport=ask monitor=ask vgasize=ask -dmamode=ask adisk=/dev/sdD0/data cdboot=yes # console=0 diff --git a/sys/src/9/pc/sdata.c b/sys/src/9/pc/sdata.c index 21b289db9..acc6c2ef2 100644 --- a/sys/src/9/pc/sdata.c +++ b/sys/src/9/pc/sdata.c @@ -570,7 +570,8 @@ atadmamode(Drive* drive) if(drive->dma) drive->dma |= 'U'<<16; } - + if(!getconf("*nodma")) + drive->dmactl = drive->dma; return dma; } diff --git a/sys/src/boot/pc/mkfile b/sys/src/boot/pc/mkfile index 25b1d3838..16d0c2063 100644 --- a/sys/src/boot/pc/mkfile +++ b/sys/src/boot/pc/mkfile @@ -54,17 +54,11 @@ $BIN/%: % test.iso: 9bootiso rm -fr tmp $target mkdir tmp - touch tmp/foo - touch tmp/bar - touch tmp/baz - touch tmp/386aaa mkdir tmp/386 - cp 386/9bootiso tmp/386 - cp /386/9pc tmp/386 - cp /386/9pcload tmp/386 - cp /386/9pcf tmp/386 + cp 9bootiso tmp/386 + cp /386/9pccd tmp/386 mkdir tmp/cfg - echo 'bootfile=/386/9pc' >tmp/cfg/plan9.ini + echo 'bootfile=/386/9pccd' >tmp/cfg/plan9.ini disk/mk9660 -B 386/9bootiso -p /sys/lib/sysconfig/proto/allproto -s tmp $target rm -fr tmp |