Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
drivers
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Liam Naddell
drivers
Commits
b9a25544
Commit
b9a25544
authored
Sep 22, 2016
by
Jeremy Soller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add login process. Remove debugging. Fix order of arguments
parent
dbb554f8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
60 deletions
+12
-60
vesad/src/main.rs
vesad/src/main.rs
+12
-60
No files found.
vesad/src/main.rs
View file @
b9a25544
...
...
@@ -8,17 +8,15 @@ extern crate ransid;
extern
crate
syscall
;
use
std
::
cell
::
RefCell
;
use
std
::
collections
::
BTreeMap
;
use
std
::
fs
::
File
;
use
std
::
io
::{
Read
,
Write
};
use
std
::
sync
::
atomic
::{
AtomicUsize
,
Ordering
};
use
std
::{
cmp
,
slice
,
thread
};
use
std
::{
slice
,
thread
};
use
ransid
::{
Console
,
Event
};
use
syscall
::{
physmap
,
physunmap
,
Error
,
EINVAL
,
EBADF
,
Packet
,
Result
,
Scheme
,
SEEK_SET
,
SEEK_CUR
,
SEEK_END
,
MAP_WRITE
,
MAP_WRITE_COMBINE
};
use
syscall
::{
physmap
,
physunmap
,
Packet
,
Result
,
Scheme
,
MAP_WRITE
,
MAP_WRITE_COMBINE
};
use
display
::
Display
;
use
mode_info
::
VBEModeInfo
;
use
primitive
::
{
fast_copy
,
fast_set64
}
;
use
primitive
::
fast_set64
;
pub
mod
display
;
pub
mod
mode_info
;
...
...
@@ -26,9 +24,7 @@ pub mod primitive;
struct
DisplayScheme
{
console
:
RefCell
<
Console
>
,
display
:
RefCell
<
Display
>
,
next_id
:
AtomicUsize
,
handles
:
RefCell
<
BTreeMap
<
usize
,
usize
>>
display
:
RefCell
<
Display
>
}
impl
Scheme
for
DisplayScheme
{
...
...
@@ -40,6 +36,10 @@ impl Scheme for DisplayScheme {
Ok
(
0
)
}
fn
fsync
(
&
self
,
_
id
:
usize
)
->
Result
<
usize
>
{
Ok
(
0
)
}
fn
write
(
&
self
,
_
id
:
usize
,
buf
:
&
[
u8
])
->
Result
<
usize
>
{
let
mut
display
=
self
.display
.borrow_mut
();
self
.console
.borrow_mut
()
.write
(
buf
,
|
event
|
{
...
...
@@ -52,57 +52,11 @@ impl Scheme for DisplayScheme {
Ok
(
buf
.len
())
}
fn
close
(
&
self
,
id
:
usize
)
->
Result
<
usize
>
{
fn
close
(
&
self
,
_
id
:
usize
)
->
Result
<
usize
>
{
Ok
(
0
)
}
}
/*
struct DisplayScheme {
display: RefCell<Display>,
next_id: AtomicUsize,
handles: RefCell<BTreeMap<usize, usize>>
}
impl Scheme for DisplayScheme {
fn open(&self, _path: &[u8], _flags: usize) -> Result<usize> {
let id = self.next_id.fetch_add(1, Ordering::SeqCst);
self.handles.borrow_mut().insert(id, 0);
Ok(id)
}
fn write(&self, id: usize, buf: &[u8]) -> Result<usize> {
let mut handles = self.handles.borrow_mut();
let mut seek = handles.get_mut(&id).ok_or(Error::new(EBADF))?;
let mut display = self.display.borrow_mut();
let len = cmp::min(buf.len(), display.offscreen.len() * 4 - *seek);
unsafe {
fast_copy((display.offscreen.as_mut_ptr() as usize + *seek) as *mut u8, buf.as_ptr(), len);
fast_copy((display.onscreen.as_mut_ptr() as usize + *seek) as *mut u8, buf.as_ptr(), len);
}
*seek += len;
Ok(len)
}
fn seek(&self, id: usize, pos: usize, whence: usize) -> Result<usize> {
let mut handles = self.handles.borrow_mut();
let mut seek = handles.get_mut(&id).ok_or(Error::new(EBADF))?;
let len = self.display.borrow().offscreen.len() * 4;
*seek = match whence {
SEEK_SET => cmp::min(len, pos),
SEEK_CUR => cmp::max(0, cmp::min(len as isize, *seek as isize + pos as isize)) as usize,
SEEK_END => cmp::max(0, cmp::min(len as isize, len as isize + pos as isize)) as usize,
_ => return Err(Error::new(EINVAL))
};
Ok(*seek)
}
fn close(&self, id: usize) -> Result<usize> {
self.handles.borrow_mut().remove(&id).ok_or(Error::new(EBADF)).and(Ok(0))
}
}
*/
fn
main
()
{
let
width
;
let
height
;
...
...
@@ -135,17 +89,15 @@ fn main() {
display
:
RefCell
::
new
(
Display
::
new
(
width
,
height
,
unsafe
{
slice
::
from_raw_parts_mut
(
onscreen
as
*
mut
u32
,
size
)
},
unsafe
{
slice
::
from_raw_parts_mut
(
offscreen
as
*
mut
u32
,
size
)
}
)),
next_id
:
AtomicUsize
::
new
(
0
),
handles
:
RefCell
::
new
(
BTreeMap
::
new
())
))
};
loop
{
let
mut
packet
=
Packet
::
default
();
socket
.read
(
&
mut
packet
);
socket
.read
(
&
mut
packet
)
.expect
(
"vesad: failed to read display scheme"
)
;
//println!("vesad: {:?}", packet);
scheme
.handle
(
&
mut
packet
);
socket
.write
(
&
packet
);
socket
.write
(
&
packet
)
.expect
(
"vesad: failed to write display scheme"
)
;
}
});
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment