Jika/redox-kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved event signal/wait code into context

Browse Source
This commit is contained in:
Connor Wood
2017-07-29 12:57:53 +03:00
parent ab98746879
commit 6122b21997
3 changed files with 88 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/acpi/aml/parser.rs
View File

@@ -65,6 +65,73 @@ impl AmlExecutionContext {
sync_level: 0
}
}
pub fn wait_for_event(&mut self, event_ptr: AmlValue) -> Result<bool, AmlError> {
let mut namespace_ptr = self.prelock();
let mut namespace = match *namespace_ptr {
Some(ref mut n) => n,
None => return Err(AmlError::AmlHardFatal)
};
let mutex_idx = match event_ptr {
AmlValue::String(ref s) => s.clone(),
AmlValue::ObjectReference(ref o) => match *o {
ObjectReference::Object(ref s) => s.clone(),
_ => return Err(AmlError::AmlValueError)
},
_ => return Err(AmlError::AmlValueError)
};
let mutex = match namespace.get(&mutex_idx) {
Some(s) => s.clone(),
None => return Err(AmlError::AmlValueError)
};
match mutex {
AmlValue::Event(count) => {
if count > 0 {
namespace.insert(mutex_idx, AmlValue::Event(count - 1));
return Ok(true);
}
},
_ => return Err(AmlError::AmlValueError)
}
Ok(false)
}
pub fn signal_event(&mut self, event_ptr: AmlValue) -> Result<(), AmlError> {
let mut namespace_ptr = self.prelock();
let mut namespace = match *namespace_ptr {
Some(ref mut n) => n,
None => return Err(AmlError::AmlHardFatal)
};
let mutex_idx = match event_ptr {
AmlValue::String(ref s) => s.clone(),
AmlValue::ObjectReference(ref o) => match *o {
ObjectReference::Object(ref s) => s.clone(),
_ => return Err(AmlError::AmlValueError)
},
_ => return Err(AmlError::AmlValueError)
};
let mutex = match namespace.get(&mutex_idx) {
Some(s) => s.clone(),
None => return Err(AmlError::AmlValueError)
};
match mutex {
AmlValue::Event(count) => {
namespace.insert(mutex_idx, AmlValue::Event(count + 1));
return Ok(());
},
_ => return Err(AmlError::AmlValueError)
}
Ok(())
}
pub fn release_mutex(&mut self, mutex_ptr: AmlValue) -> Result<(), AmlError> {
let id = self.ctx_id;
@@ -123,9 +190,8 @@ impl AmlExecutionContext {
Ok(())
}
pub fn acquire_mutex(&mut self, mutex_ptr: AmlValue, timeout: u16) -> Result<bool, AmlError> {
let id = self.ctx_id;
pub fn acquire_mutex(&mut self, mutex_ptr: AmlValue) -> Result<bool, AmlError> {
let id = self.ctx_id;
let mut namespace_ptr = self.prelock();
let mut namespace = match *namespace_ptr {

6
src/acpi/aml/type1opcode.rs
View File

@@ -246,11 +246,7 @@ fn parse_def_signal(data: &[u8],
parser_opcode_extended!(data, 0x24);
let object = parse_super_name(&data[2..], ctx)?;
let namespace = ctx.prelock();
let event = ctx.get(object.val.clone()).get_as_event()?;
ctx.modify(object.val.clone(), AmlValue::Event(event + 1));
ctx.signal_event(object.val)?;
Ok(AmlParseType {
val: AmlValue::None,
len: 2 + object.len

46
src/acpi/aml/type2opcode.rs
View File

@@ -329,7 +329,7 @@ fn parse_def_acquire(data: &[u8],
let starting_time_ns = nanoseconds + (seconds * 1000000000);
loop {
match ctx.acquire_mutex(obj.val.clone(), timeout) {
match ctx.acquire_mutex(obj.val.clone()) {
Err(e) => return Err(e),
Ok(b) => if b {
return Ok(AmlParseType {
@@ -1012,35 +1012,25 @@ fn parse_def_wait(data: &[u8],
let starting_time_ns = nanoseconds + (seconds * 1000000000);
loop {
{
let mut namespace = ctx.prelock();
let mutex = ctx.get(obj.val.clone());
match mutex {
AmlValue::Event(count) => {
if count > 0 {
ctx.modify(obj.val.clone(), AmlValue::Event(count - 1));
return Ok(AmlParseType {
val: AmlValue::Integer(0),
len: 2 + obj.len + timeout_obj.len
});
}
},
_ => return Err(AmlError::AmlValueError)
}
}
if timeout >= 0xFFFF {
// TODO: Brief sleep here
} else {
let (seconds, nanoseconds) = monotonic();
let current_time_ns = nanoseconds + (seconds * 1000000000);
if current_time_ns - starting_time_ns > timeout as u64 * 1000000 {
match ctx.wait_for_event(obj.val.clone()) {
Err(e) => return Err(e),
Ok(b) => if b {
return Ok(AmlParseType {
val: AmlValue::Integer(1),
val: AmlValue::Integer(0),
len: 2 + obj.len + timeout_obj.len
});
})
} else if timeout >= 0xFFFF {
// TODO: Brief sleep here
} else {
let (seconds, nanoseconds) = monotonic();
let current_time_ns = nanoseconds + (seconds * 1000000000);
if current_time_ns - starting_time_ns > timeout as u64 * 1000000 {
return Ok(AmlParseType {
val: AmlValue::Integer(1),
len: 2 + obj.len + timeout_obj.len
});
}
}
}
}