diff options
| author | Michael Brown | 2015-03-05 03:30:58 +0100 |
|---|---|---|
| committer | Michael Brown | 2015-03-05 03:30:58 +0100 |
| commit | 81166302a082210346e8006b37167bbaf89b3e85 (patch) | |
| tree | ce7ac80ed754124a761b16560582755daded888e /src/arch/i386/include | |
| parent | [build] Fix the REQUIRE_SYMBOL mechanism (diff) | |
| download | ipxe-81166302a082210346e8006b37167bbaf89b3e85.tar.gz ipxe-81166302a082210346e8006b37167bbaf89b3e85.tar.xz ipxe-81166302a082210346e8006b37167bbaf89b3e85.zip | |
[i386] Move real_to_user() to realmode.h
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386/include')
| -rw-r--r-- | src/arch/i386/include/librm.h | 12 | ||||
| -rw-r--r-- | src/arch/i386/include/realmode.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/arch/i386/include/librm.h b/src/arch/i386/include/librm.h index c37373ddc..a8a578a39 100644 --- a/src/arch/i386/include/librm.h +++ b/src/arch/i386/include/librm.h @@ -170,18 +170,6 @@ extern uint16_t __text16 ( rm_cs ); extern uint16_t __text16 ( rm_ds ); #define rm_ds __use_text16 ( rm_ds ) -/** - * Convert segment:offset address to user buffer - * - * @v segment Real-mode segment - * @v offset Real-mode offset - * @ret buffer User buffer - */ -static inline __always_inline userptr_t -real_to_user ( unsigned int segment, unsigned int offset ) { - return ( phys_to_user ( ( segment << 4 ) + offset ) ); -} - extern uint16_t copy_user_to_rm_stack ( userptr_t data, size_t size ); extern void remove_user_from_rm_stack ( userptr_t data, size_t size ); diff --git a/src/arch/i386/include/realmode.h b/src/arch/i386/include/realmode.h index 5727e5ac5..4defd3b97 100644 --- a/src/arch/i386/include/realmode.h +++ b/src/arch/i386/include/realmode.h @@ -65,6 +65,18 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); */ /** + * Convert segment:offset address to user buffer + * + * @v segment Real-mode segment + * @v offset Real-mode offset + * @ret buffer User buffer + */ +static inline __always_inline userptr_t +real_to_user ( unsigned int segment, unsigned int offset ) { + return ( phys_to_user ( ( segment << 4 ) + offset ) ); +} + +/** * Copy data to base memory * * @v dest_seg Destination segment |