Skip to content

Fix compilation errors on aarch64 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix compilation errors on aarch64 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d174bfa
Fix aarch64 error
hide0123 Feb 17, 2022
2349f51
Fix parameter error
hide0123 Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libllama/src/cpu/irq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl IrqLine {

pub trait IrqClient: Clone {
fn assert<IRQ: IrqType>(&mut self, irq: IRQ);
fn is_enabled(&self, u32) -> bool;
fn is_enabled(&self, _: u32) -> bool;
}

pub trait IrqServer {
Expand Down
6 changes: 3 additions & 3 deletions llama-ui/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ mod cbs {
backend.msg_client.send(Message::HidUpdate(state));
}

pub unsafe extern fn run_command(backend: *mut c::Backend, str_buf: *const i8, str_len: usize) {
pub unsafe extern fn run_command(backend: *mut c::Backend, str_buf: *const libc::c_char, str_len: usize) {
let backend = Backend::from_c(backend);
let input = {
let slice = slice::from_raw_parts(str_buf as *const u8, str_len);
Expand Down Expand Up @@ -213,7 +213,7 @@ mod cbs {

pub unsafe extern fn buffer(buf: c::LogBufferMutView) -> c::LogBufferView {
let new_slice = lgl::buffer(slice::from_raw_parts_mut(buf.buf_ptr as *mut u8, buf.buf_size));
c::LogBufferView { buf_ptr: new_slice.as_ptr() as *const i8, buf_size: new_slice.len() }
c::LogBufferView { buf_ptr: new_slice.as_ptr() as *const libc::c_char, buf_size: new_slice.len() }
}

pub extern fn buffer_size() -> usize {
Expand Down Expand Up @@ -288,7 +288,7 @@ fn main() {
unsafe {
c::llama_open_gui(
c_args.len() as i32,
c_args.as_mut_ptr() as *mut *mut i8,
c_args.as_mut_ptr() as *mut *mut libc::c_char,
backend.to_c(),
&callbacks)
};
Expand Down