storage/driver-block: Remove id method from Disk trait
This commit is contained in:
@@ -154,10 +154,6 @@ impl DiskATA {
|
||||
}
|
||||
|
||||
impl Disk for DiskATA {
|
||||
fn id(&self) -> usize {
|
||||
self.id
|
||||
}
|
||||
|
||||
fn size(&mut self) -> u64 {
|
||||
self.size
|
||||
}
|
||||
|
||||
@@ -72,10 +72,6 @@ impl DiskATAPI {
|
||||
}
|
||||
|
||||
impl Disk for DiskATAPI {
|
||||
fn id(&self) -> usize {
|
||||
self.id
|
||||
}
|
||||
|
||||
fn size(&mut self) -> u64 {
|
||||
match self.read_capacity() {
|
||||
Ok((blk_count, blk_size)) => (blk_count as u64) * (blk_size as u64),
|
||||
|
||||
@@ -733,10 +733,6 @@ impl SdHostCtrl {
|
||||
}
|
||||
|
||||
impl Disk for SdHostCtrl {
|
||||
fn id(&self) -> usize {
|
||||
0xdead_dead
|
||||
}
|
||||
|
||||
fn size(&mut self) -> u64 {
|
||||
//assert 512MiB
|
||||
self.size
|
||||
|
||||
@@ -54,7 +54,6 @@ pub fn block_read(
|
||||
}
|
||||
|
||||
pub trait Disk {
|
||||
fn id(&self) -> usize;
|
||||
fn block_length(&mut self) -> syscall::error::Result<u32>;
|
||||
fn size(&mut self) -> u64;
|
||||
|
||||
|
||||
@@ -169,10 +169,6 @@ pub struct AtaDisk {
|
||||
}
|
||||
|
||||
impl Disk for AtaDisk {
|
||||
fn id(&self) -> usize {
|
||||
self.chan_i << 1 | self.dev as usize
|
||||
}
|
||||
|
||||
fn size(&mut self) -> u64 {
|
||||
self.size
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user