d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a couple of lines that dropped out in my merge yesterday.

Browse Source 
Complained about by:	ache
This commit is contained in:
Poul-Henning Kamp 1998-02-13 17:54:53 +00:00
parent cc7324910b
commit aa7caaaeb8
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/syscons/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: syscons.c,v 1.254 1998/02/12 22:05:05 phk Exp $ * $Id: syscons.c,v 1.255 1998/02/13 11:31:34 phk Exp $
*/ */
#include "sc.h" #include "sc.h"
@ -507,8 +507,12 @@ scvidprobe(int unit, int flags)
/* Get the BIOS video mode pointer */ /* Get the BIOS video mode pointer */
segoff = *(u_long *)pa_to_va(0x4a8); segoff = *(u_long *)pa_to_va(0x4a8);
pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff)); pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff));
if (ISMAPPED(pa, MODE_PARAM_SIZE)) if (ISMAPPED(pa, sizeof(u_long))) {
video_mode_ptr = (char *)pa_to_va(pa); segoff = *(u_long *)pa_to_va(pa);
pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff));
if (ISMAPPED(pa, MODE_PARAM_SIZE))
video_mode_ptr = (char *)pa_to_va(pa);
}
} }
} }

10
sys/i386/isa/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: syscons.c,v 1.254 1998/02/12 22:05:05 phk Exp $ * $Id: syscons.c,v 1.255 1998/02/13 11:31:34 phk Exp $
*/ */
#include "sc.h" #include "sc.h"
@ -507,8 +507,12 @@ scvidprobe(int unit, int flags)
/* Get the BIOS video mode pointer */ /* Get the BIOS video mode pointer */
segoff = *(u_long *)pa_to_va(0x4a8); segoff = *(u_long *)pa_to_va(0x4a8);
pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff)); pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff));
if (ISMAPPED(pa, MODE_PARAM_SIZE)) if (ISMAPPED(pa, sizeof(u_long))) {
video_mode_ptr = (char *)pa_to_va(pa); segoff = *(u_long *)pa_to_va(pa);
pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff));
if (ISMAPPED(pa, MODE_PARAM_SIZE))
video_mode_ptr = (char *)pa_to_va(pa);
}
} }
} }

10
sys/isa/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: syscons.c,v 1.254 1998/02/12 22:05:05 phk Exp $ * $Id: syscons.c,v 1.255 1998/02/13 11:31:34 phk Exp $
*/ */
#include "sc.h" #include "sc.h"
@ -507,8 +507,12 @@ scvidprobe(int unit, int flags)
/* Get the BIOS video mode pointer */ /* Get the BIOS video mode pointer */
segoff = *(u_long *)pa_to_va(0x4a8); segoff = *(u_long *)pa_to_va(0x4a8);
pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff)); pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff));
if (ISMAPPED(pa, MODE_PARAM_SIZE)) if (ISMAPPED(pa, sizeof(u_long))) {
video_mode_ptr = (char *)pa_to_va(pa); segoff = *(u_long *)pa_to_va(pa);
pa = (((segoff & 0xffff0000) >> 12) + (segoff & 0xffff));
if (ISMAPPED(pa, MODE_PARAM_SIZE))
video_mode_ptr = (char *)pa_to_va(pa);
}
} }
} }