Skip to content

Commit

Permalink
Cleanup warnings
Browse files Browse the repository at this point in the history 
Implement interrupt on signal in pipe:
  • Loading branch information
@jackpot51
jackpot51 committed Oct 22, 2017
1 parent 31d742e commit 51339cb
Show file tree
Hide file tree
Showing 18 changed files with 124 additions and 90 deletions.
2 changes: 1 addition & 1 deletion src/acpi/aml/namedobj.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ fn parse_def_create_dword_field(data: &[u8],

let local_scope_string = get_namespace_string(ctx.scope.clone(), name.val)?;

ctx.add_to_namespace(local_scope_string, AmlValue::BufferField(BufferField {
let _ = ctx.add_to_namespace(local_scope_string, AmlValue::BufferField(BufferField {
source_buf: Box::new(source_buf.val),
index: Box::new(bit_index.val),
length: Box::new(AmlValue::IntegerConstant(32))
Expand Down
8 changes: 5 additions & 3 deletions src/acpi/aml/namespace.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ pub enum AmlValue {
String(String),
PowerResource(PowerResource),
Processor(Processor),
RawDataBuffer(Vec<u8>),
//RawDataBuffer(Vec<u8>),
ThermalZone(ThermalZone)
}

impl Debug for AmlValue {
fn fmt(&self, f: &mut Formatter) -> Result<(), Error> { Ok(()) }
fn fmt(&self, _f: &mut Formatter) -> Result<(), Error> { Ok(()) }
}

impl AmlValue {
Expand Down Expand Up @@ -373,12 +373,14 @@ impl AmlValue {
}
}

/*
pub fn get_as_operation_region(&self) -> Result<OperationRegion, AmlError> {
match *self {
AmlValue::OperationRegion(ref p) => Ok(p.clone()),
_ => Err(AmlError::AmlValueError)
}
}
*/

pub fn get_as_package(&self) -> Result<Vec<AmlValue>, AmlError> {
match *self {
Expand Down Expand Up @@ -435,7 +437,7 @@ impl Method {
let mut ctx = AmlExecutionContext::new(scope);
ctx.init_arg_vars(parameters);

parse_term_list(&self.term_list[..], &mut ctx);
let _ = parse_term_list(&self.term_list[..], &mut ctx);
ctx.clean_namespace();

match ctx.state {
Expand Down
6 changes: 3 additions & 3 deletions src/acpi/aml/parser.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,12 +364,12 @@ impl AmlExecutionContext {
let mut idx = indices[0];
idx += b.index.get_as_integer()?;

self.modify(AmlValue::ObjectReference(ObjectReference::Index(b.source_buf.clone(), Box::new(AmlValue::Integer(idx.clone())))), value);
let _ = self.modify(AmlValue::ObjectReference(ObjectReference::Index(b.source_buf.clone(), Box::new(AmlValue::Integer(idx.clone())))), value);

Ok(AmlValue::BufferField(b.clone()))
},
AmlValue::Package(ref p) => {
if indices.len() < 0 {
if indices.len() == 0 {
return Err(AmlError::AmlValueError);
}

Expand Down Expand Up @@ -491,7 +491,7 @@ impl AmlExecutionContext {
Ok(AmlValue::Integer(b.source_buf.get_as_buffer()?[idx as usize] as u64))
},
AmlValue::Package(ref p) => {
if indices.len() < 0 {
if indices.len() == 0 {
return Err(AmlError::AmlValueError);
}

Expand Down
6 changes: 3 additions & 3 deletions src/acpi/aml/type1opcode.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ fn parse_def_load(data: &[u8],
if is_aml_table(sdt) {
load_table(get_sdt_signature(sdt));
let delta = parse_aml_table(sdt)?;
ctx.modify(ddb_handle_object.val, AmlValue::DDBHandle((delta, get_sdt_signature(sdt))));
let _ = ctx.modify(ddb_handle_object.val, AmlValue::DDBHandle((delta, get_sdt_signature(sdt))));

Ok(AmlParseType {
val: AmlValue::None,
Expand Down Expand Up @@ -229,7 +229,7 @@ fn parse_def_release(data: &[u8],
parser_opcode_extended!(data, 0x27);

let obj = parse_super_name(&data[2..], ctx)?;
ctx.release_mutex(obj.val);
let _ = ctx.release_mutex(obj.val);

Ok(AmlParseType {
val: AmlValue::None,
Expand All @@ -252,7 +252,7 @@ fn parse_def_reset(data: &[u8],
let object = parse_super_name(&data[2..], ctx)?;
ctx.get(object.val.clone())?.get_as_event()?;

ctx.modify(object.val.clone(), AmlValue::Event(0));
let _ = ctx.modify(object.val.clone(), AmlValue::Event(0));

Ok(AmlParseType {
val: AmlValue::None,
Expand Down
64 changes: 32 additions & 32 deletions src/acpi/aml/type2opcode.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,9 @@ fn parse_def_increment(data: &[u8],

let obj = parse_super_name(&data[1..], ctx)?;

let mut _namespace = ctx.prelock();
let _namespace = ctx.prelock();
let value = AmlValue::Integer(ctx.get(obj.val.clone())?.get_as_integer()? + 1);
ctx.modify(obj.val, value.clone());
let _ = ctx.modify(obj.val, value.clone());

Ok(AmlParseType {
val: value,
Expand All @@ -394,7 +394,7 @@ fn parse_def_index(data: &[u8],
let target = parse_target(&data[1 + obj.len + idx.len..], ctx)?;

let reference = AmlValue::ObjectReference(ObjectReference::Index(Box::new(obj.val), Box::new(idx.val)));
ctx.modify(target.val, reference.clone());
let _ = ctx.modify(target.val, reference.clone());

Ok(AmlParseType {
val: reference,
Expand Down Expand Up @@ -571,7 +571,7 @@ fn parse_def_to_hex_string(data: &[u8],
_ => return Err(AmlError::AmlValueError)
};

ctx.modify(target.val, res.clone());
let _ = ctx.modify(target.val, res.clone());

Ok(AmlParseType {
val: res,
Expand All @@ -595,7 +595,7 @@ fn parse_def_to_buffer(data: &[u8],
let target = parse_target(&data[2 + operand.len..], ctx)?;

let res = AmlValue::Buffer(operand.val.get_as_buffer()?);
ctx.modify(target.val, res.clone());
let _ = ctx.modify(target.val, res.clone());

Ok(AmlParseType {
val: res,
Expand Down Expand Up @@ -628,7 +628,7 @@ fn parse_def_to_bcd(data: &[u8],
}

let result = AmlValue::Integer(result);
ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand Down Expand Up @@ -668,7 +668,7 @@ fn parse_def_to_decimal_string(data: &[u8],
_ => return Err(AmlError::AmlValueError)
};

ctx.modify(target.val, res.clone());
let _ = ctx.modify(target.val, res.clone());

Ok(AmlParseType {
val: res,
Expand All @@ -693,7 +693,7 @@ fn parse_def_to_integer(data: &[u8],

let res = AmlValue::Integer(operand.val.get_as_integer()?);

ctx.modify(target.val, res.clone());
let _ = ctx.modify(target.val, res.clone());

Ok(AmlParseType {
val: res,
Expand Down Expand Up @@ -726,7 +726,7 @@ fn parse_def_to_string(data: &[u8],
string.truncate(length.val.get_as_integer()? as usize);
let res = AmlValue::String(string);

ctx.modify(target.val, res.clone());
let _ = ctx.modify(target.val, res.clone());

Ok(AmlParseType {
val: res,
Expand All @@ -752,7 +752,7 @@ fn parse_def_subtract(data: &[u8],

let result = AmlValue::Integer(lhs.val.get_as_integer()? - rhs.val.get_as_integer()?);

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand Down Expand Up @@ -803,7 +803,7 @@ fn parse_def_store(data: &[u8],
let operand = parse_term_arg(&data[1..], ctx)?;
let target = parse_super_name(&data[1 + operand.len..], ctx)?;

ctx.modify(target.val.clone(), operand.val);
let _ = ctx.modify(target.val.clone(), operand.val);

Ok(AmlParseType {
val: target.val,
Expand All @@ -829,7 +829,7 @@ fn parse_def_or(data: &[u8],

let result = AmlValue::Integer(lhs.val.get_as_integer()? | rhs.val.get_as_integer()?);

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand All @@ -855,7 +855,7 @@ fn parse_def_shift_left(data: &[u8],

let result = AmlValue::Integer(lhs.val.get_as_integer()? >> rhs.val.get_as_integer()?);

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand All @@ -881,7 +881,7 @@ fn parse_def_shift_right(data: &[u8],

let result = AmlValue::Integer(lhs.val.get_as_integer()? << rhs.val.get_as_integer()?);

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand All @@ -907,7 +907,7 @@ fn parse_def_add(data: &[u8],

let result = AmlValue::Integer(lhs.val.get_as_integer()? + rhs.val.get_as_integer()?);

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand All @@ -933,7 +933,7 @@ fn parse_def_and(data: &[u8],

let result = AmlValue::Integer(lhs.val.get_as_integer()? & rhs.val.get_as_integer()?);

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand All @@ -959,7 +959,7 @@ fn parse_def_xor(data: &[u8],

let result = AmlValue::Integer(lhs.val.get_as_integer()? ^ rhs.val.get_as_integer()?);

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand Down Expand Up @@ -1093,7 +1093,7 @@ fn parse_def_cond_ref_of(data: &[u8],
_ => return Err(AmlError::AmlValueError)
};

ctx.modify(target.val, AmlValue::ObjectReference(res));
let _ = ctx.modify(target.val, AmlValue::ObjectReference(res));

Ok(AmlParseType {
val: AmlValue::Integer(1),
Expand Down Expand Up @@ -1208,9 +1208,9 @@ fn parse_def_decrement(data: &[u8],

let obj = parse_super_name(&data[1..], ctx)?;

let namespace = ctx.prelock();
let _namespace = ctx.prelock();
let value = AmlValue::Integer(ctx.get(obj.val.clone())?.get_as_integer()? - 1);
ctx.modify(obj.val, value.clone());
let _ = ctx.modify(obj.val, value.clone());

Ok(AmlParseType {
val: value,
Expand Down Expand Up @@ -1241,8 +1241,8 @@ fn parse_def_divide(data: &[u8],
let remainder = numerator % denominator;
let quotient = (numerator - remainder) / denominator;

ctx.modify(target_remainder.val, AmlValue::Integer(remainder));
ctx.modify(target_quotient.val, AmlValue::Integer(quotient));
let _ = ctx.modify(target_remainder.val, AmlValue::Integer(remainder));
let _ = ctx.modify(target_quotient.val, AmlValue::Integer(quotient));

Ok(AmlParseType {
val: AmlValue::Integer(quotient),
Expand Down Expand Up @@ -1278,7 +1278,7 @@ fn parse_def_find_set_left_bit(data: &[u8],
}

let result = AmlValue::Integer(first_bit);
ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand Down Expand Up @@ -1318,7 +1318,7 @@ fn parse_def_find_set_right_bit(data: &[u8],
}

let result = AmlValue::Integer(first_bit);
ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand Down Expand Up @@ -1364,7 +1364,7 @@ fn parse_def_load_table(data: &[u8],

if let Some(sdt) = sdt {
let hdl = parse_aml_with_scope(sdt, root_path.val.get_as_string()?)?;
ctx.modify(parameter_path.val, parameter_data.val);
let _ = ctx.modify(parameter_path.val, parameter_data.val);

return Ok(AmlParseType {
val: AmlValue::DDBHandle((hdl, sdt_signature)),
Expand Down Expand Up @@ -1553,7 +1553,7 @@ fn parse_def_from_bcd(data: &[u8],

let result = AmlValue::Integer(result);

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand Down Expand Up @@ -1615,7 +1615,7 @@ fn parse_def_mid(data: &[u8],
}
};

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand Down Expand Up @@ -1645,7 +1645,7 @@ fn parse_def_mod(data: &[u8],

let result = AmlValue::Integer(lhs.val.get_as_integer()? % rhs.val.get_as_integer()?);

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand All @@ -1672,7 +1672,7 @@ fn parse_def_multiply(data: &[u8],

let result = AmlValue::Integer(lhs.val.get_as_integer()? * rhs.val.get_as_integer()?);

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand All @@ -1698,7 +1698,7 @@ fn parse_def_nand(data: &[u8],

let result = AmlValue::Integer(!(lhs.val.get_as_integer()? & rhs.val.get_as_integer()?));

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand All @@ -1724,7 +1724,7 @@ fn parse_def_nor(data: &[u8],

let result = AmlValue::Integer(!(lhs.val.get_as_integer()? | rhs.val.get_as_integer()?));

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand All @@ -1749,7 +1749,7 @@ fn parse_def_not(data: &[u8],

let result = AmlValue::Integer(!operand.val.get_as_integer()?);

ctx.modify(target.val, result.clone());
let _ = ctx.modify(target.val, result.clone());

Ok(AmlParseType {
val: result,
Expand Down
2 changes: 1 addition & 1 deletion src/acpi/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ pub unsafe fn init(active_table: &mut ActivePageTable) {
rxsdt.map_all(active_table);

for sdt_address in rxsdt.iter() {
let sdt = unsafe { &*(sdt_address as *const Sdt) };
let sdt = &*(sdt_address as *const Sdt);

let signature = get_sdt_signature(sdt);
if let Some(ref mut ptrs) = *(SDT_POINTERS.write()) {
Expand Down
2 changes: 1 addition & 1 deletion src/arch/x86_64/interrupt/irq.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ interrupt!(pit, {
pic::MASTER.ack();

if PIT_TICKS.fetch_add(1, Ordering::SeqCst) >= 10 {
context::switch();
let _ = context::switch();
}

// Any better way of doing this?
Expand Down
2 changes: 1 addition & 1 deletion src/consts.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/// Offset to kernel heap
pub const KERNEL_HEAP_OFFSET: usize = KERNEL_OFFSET + PML4_SIZE/2;
/// Size of kernel heap
pub const KERNEL_HEAP_SIZE: usize = 64 * 1024 * 1024; // 64 MB
pub const KERNEL_HEAP_SIZE: usize = 256 * 1024 * 1024; // 256 MB

/// Offset to kernel percpu variables
//TODO: Use 64-bit fs offset to enable this pub const KERNEL_PERCPU_OFFSET: usize = KERNEL_HEAP_OFFSET - PML4_SIZE;
Expand Down
Loading

0 comments on commit 51339cb

Please sign in to comment.