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
60840376
Commit
60840376
authored
Jan 09, 2017
by
Jeremy Soller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor to move io into syscall, and use git for crate references
parent
9eeade88
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
25 additions
and
34 deletions
+25
-34
ahcid/Cargo.toml
ahcid/Cargo.toml
+1
-3
ahcid/src/ahci/disk.rs
ahcid/src/ahci/disk.rs
+1
-1
ahcid/src/ahci/fis.rs
ahcid/src/ahci/fis.rs
+1
-1
ahcid/src/ahci/hba.rs
ahcid/src/ahci/hba.rs
+1
-2
ahcid/src/ahci/mod.rs
ahcid/src/ahci/mod.rs
+1
-1
ahcid/src/main.rs
ahcid/src/main.rs
+1
-2
bgad/src/main.rs
bgad/src/main.rs
+2
-0
e1000d/Cargo.toml
e1000d/Cargo.toml
+3
-5
e1000d/src/device.rs
e1000d/src/device.rs
+1
-1
e1000d/src/main.rs
e1000d/src/main.rs
+0
-1
pcid/Cargo.toml
pcid/Cargo.toml
+1
-1
pcid/src/main.rs
pcid/src/main.rs
+1
-0
ps2d/Cargo.toml
ps2d/Cargo.toml
+2
-3
ps2d/src/controller.rs
ps2d/src/controller.rs
+1
-1
ps2d/src/main.rs
ps2d/src/main.rs
+1
-1
rtl8168d/Cargo.toml
rtl8168d/Cargo.toml
+3
-5
rtl8168d/src/device.rs
rtl8168d/src/device.rs
+1
-2
rtl8168d/src/main.rs
rtl8168d/src/main.rs
+0
-2
vesad/Cargo.toml
vesad/Cargo.toml
+1
-1
vesad/src/main.rs
vesad/src/main.rs
+1
-0
vesad/src/screen/text.rs
vesad/src/screen/text.rs
+1
-1
No files found.
ahcid/Cargo.toml
View file @
60840376
...
...
@@ -4,7 +4,5 @@ version = "0.1.0"
[dependencies]
bitflags
=
"*"
dma
=
{
path
=
"../../crates/dma/"
}
io
=
{
path
=
"../../crates/io/"
}
spin
=
"*"
redox_syscall
=
{
path
=
"../../syscall/
"
}
redox_syscall
=
{
git
=
"https://github.com/redox-os/syscall.git
"
}
ahcid/src/ahci/disk.rs
View file @
60840376
use
std
::
ptr
;
use
dma
::
Dma
;
use
syscall
::
io
::
Dma
;
use
syscall
::
error
::
Result
;
use
super
::
hba
::{
HbaPort
,
HbaCmdTable
,
HbaCmdHeader
};
...
...
ahcid/src/ahci/fis.rs
View file @
60840376
use
io
::
Mmio
;
use
syscall
::
io
::
Mmio
;
#[repr(u8)]
pub
enum
FisType
{
...
...
ahcid/src/ahci/hba.rs
View file @
60840376
...
...
@@ -2,8 +2,7 @@ use std::mem::size_of;
use
std
::
ops
::
DerefMut
;
use
std
::{
ptr
,
u32
};
use
dma
::
Dma
;
use
io
::{
Io
,
Mmio
};
use
syscall
::
io
::{
Dma
,
Io
,
Mmio
};
use
syscall
::
error
::{
Error
,
Result
,
EIO
};
use
super
::
fis
::{
FisType
,
FisRegH2D
};
...
...
ahcid/src/ahci/mod.rs
View file @
60840376
use
io
::
Io
;
use
syscall
::
io
::
Io
;
use
self
::
disk
::
Disk
;
use
self
::
hba
::{
HbaMem
,
HbaPortType
};
...
...
ahcid/src/main.rs
View file @
60840376
#![deny(warnings)]
#![feature(asm)]
#[macro_use]
extern
crate
bitflags
;
extern
crate
dma
;
extern
crate
io
;
extern
crate
spin
;
extern
crate
syscall
;
...
...
bgad/src/main.rs
View file @
60840376
#![deny(warnings)]
use
std
::
env
;
fn
main
()
{
...
...
e1000d/Cargo.toml
View file @
60840376
...
...
@@ -4,8 +4,6 @@ version = "0.1.0"
[dependencies]
bitflags
=
"*"
dma
=
{
path
=
"../../crates/dma/"
}
event
=
{
path
=
"../../crates/event/"
}
io
=
{
path
=
"../../crates/io/"
}
netutils
=
{
path
=
"../../programs/netutils/"
}
redox_syscall
=
{
path
=
"../../syscall/"
}
netutils
=
{
git
=
"https://github.com/redox-os/netutils.git"
}
redox_event
=
{
git
=
"https://github.com/redox-os/event.git"
}
redox_syscall
=
{
git
=
"https://github.com/redox-os/syscall.git"
}
e1000d/src/device.rs
View file @
60840376
use
std
::{
cmp
,
mem
,
ptr
,
slice
};
use
dma
::
Dma
;
use
netutils
::
setcfg
;
use
syscall
::
error
::{
Error
,
EACCES
,
EWOULDBLOCK
,
Result
};
use
syscall
::
flag
::
O_NONBLOCK
;
use
syscall
::
io
::
Dma
;
use
syscall
::
scheme
::
Scheme
;
const
CTRL
:
u32
=
0x00
;
...
...
e1000d/src/main.rs
View file @
60840376
#![feature(asm)]
extern
crate
dma
;
extern
crate
event
;
extern
crate
netutils
;
extern
crate
syscall
;
...
...
pcid/Cargo.toml
View file @
60840376
...
...
@@ -3,6 +3,6 @@ name = "pcid"
version
=
"0.1.0"
[dependencies]
redox_syscall
=
{
path
=
"../../syscall/
"
}
redox_syscall
=
{
git
=
"https://github.com/redox-os/syscall.git
"
}
rustc-serialize
=
"0.3"
toml
=
"0.2"
pcid/src/main.rs
View file @
60840376
#![deny(warnings)]
#![feature(asm)]
extern
crate
rustc_serialize
;
...
...
ps2d/Cargo.toml
View file @
60840376
...
...
@@ -4,7 +4,6 @@ version = "0.1.0"
[dependencies]
bitflags
=
"*"
event
=
{
path
=
"../../crates/event/"
}
io
=
{
path
=
"../../crates/io/"
}
orbclient
=
"0.2"
redox_syscall
=
{
path
=
"../../syscall/"
}
redox_event
=
{
git
=
"https://github.com/redox-os/event.git"
}
redox_syscall
=
{
git
=
"https://github.com/redox-os/syscall.git"
}
ps2d/src/controller.rs
View file @
60840376
use
io
::{
Io
,
Pio
,
ReadOnly
,
WriteOnly
};
use
syscall
::
io
::{
Io
,
Pio
,
ReadOnly
,
WriteOnly
};
bitflags!
{
flags
StatusFlags
:
u8
{
...
...
ps2d/src/main.rs
View file @
60840376
#![deny(warnings)]
#![feature(asm)]
#[macro_use]
extern
crate
bitflags
;
extern
crate
event
;
extern
crate
io
;
extern
crate
orbclient
;
extern
crate
syscall
;
...
...
rtl8168d/Cargo.toml
View file @
60840376
...
...
@@ -4,8 +4,6 @@ version = "0.1.0"
[dependencies]
bitflags
=
"*"
dma
=
{
path
=
"../../crates/dma/"
}
event
=
{
path
=
"../../crates/event/"
}
io
=
{
path
=
"../../crates/io/"
}
netutils
=
{
path
=
"../../programs/netutils/"
}
redox_syscall
=
{
path
=
"../../syscall/"
}
netutils
=
{
git
=
"https://github.com/redox-os/netutils.git"
}
redox_event
=
{
git
=
"https://github.com/redox-os/event.git"
}
redox_syscall
=
{
git
=
"https://github.com/redox-os/syscall.git"
}
rtl8168d/src/device.rs
View file @
60840376
use
std
::
mem
;
use
dma
::
Dma
;
use
io
::{
Mmio
,
Io
,
ReadOnly
};
use
netutils
::
setcfg
;
use
syscall
::
error
::{
Error
,
EACCES
,
EWOULDBLOCK
,
Result
};
use
syscall
::
flag
::
O_NONBLOCK
;
use
syscall
::
io
::{
Dma
,
Mmio
,
Io
,
ReadOnly
};
use
syscall
::
scheme
::
SchemeMut
;
#[repr(packed)]
...
...
rtl8168d/src/main.rs
View file @
60840376
#![feature(asm)]
extern
crate
dma
;
extern
crate
event
;
extern
crate
io
;
extern
crate
netutils
;
extern
crate
syscall
;
...
...
vesad/Cargo.toml
View file @
60840376
...
...
@@ -6,7 +6,7 @@ version = "0.1.0"
orbclient
=
"0.2"
ransid
=
"0.2"
rusttype
=
{
version
=
"0.2"
,
optional
=
true
}
redox_syscall
=
{
path
=
"../../syscall
"
}
redox_syscall
=
{
git
=
"https://github.com/redox-os/syscall.git
"
}
[features]
default
=
[]
vesad/src/main.rs
View file @
60840376
#![deny(warnings)]
#![feature(alloc)]
#![feature(asm)]
#![feature(heap_api)]
...
...
vesad/src/screen/text.rs
View file @
60840376
...
...
@@ -48,7 +48,7 @@ impl Screen for TextScreen {
Ok
(
0
)
}
fn
map
(
&
self
,
offset
:
usize
,
size
:
usize
)
->
Result
<
usize
>
{
fn
map
(
&
self
,
_
offset
:
usize
,
_
size
:
usize
)
->
Result
<
usize
>
{
Err
(
Error
::
new
(
EBADF
))
}
...
...
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