Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
74ee31b1
Commit
74ee31b1
authored
20 years ago
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SERIAL] Unuse old SERIAL_IO_xxx macros.
8250.c should be using the replacement UPIO_xxx macros instead.
parent
e72509c4
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
drivers/serial/8250.c
drivers/serial/8250.c
+13
-13
No files found.
drivers/serial/8250.c
View file @
74ee31b1
...
@@ -177,11 +177,11 @@ static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset)
...
@@ -177,11 +177,11 @@ static _INLINE_ unsigned int serial_in(struct uart_8250_port *up, int offset)
offset
<<=
up
->
port
.
regshift
;
offset
<<=
up
->
port
.
regshift
;
switch
(
up
->
port
.
iotype
)
{
switch
(
up
->
port
.
iotype
)
{
case
SERIAL_
IO_HUB6
:
case
UP
IO_HUB6
:
outb
(
up
->
port
.
hub6
-
1
+
offset
,
up
->
port
.
iobase
);
outb
(
up
->
port
.
hub6
-
1
+
offset
,
up
->
port
.
iobase
);
return
inb
(
up
->
port
.
iobase
+
1
);
return
inb
(
up
->
port
.
iobase
+
1
);
case
SERIAL_
IO_MEM
:
case
UP
IO_MEM
:
return
readb
(
up
->
port
.
membase
+
offset
);
return
readb
(
up
->
port
.
membase
+
offset
);
default:
default:
...
@@ -195,12 +195,12 @@ serial_out(struct uart_8250_port *up, int offset, int value)
...
@@ -195,12 +195,12 @@ serial_out(struct uart_8250_port *up, int offset, int value)
offset
<<=
up
->
port
.
regshift
;
offset
<<=
up
->
port
.
regshift
;
switch
(
up
->
port
.
iotype
)
{
switch
(
up
->
port
.
iotype
)
{
case
SERIAL_
IO_HUB6
:
case
UP
IO_HUB6
:
outb
(
up
->
port
.
hub6
-
1
+
offset
,
up
->
port
.
iobase
);
outb
(
up
->
port
.
hub6
-
1
+
offset
,
up
->
port
.
iobase
);
outb
(
value
,
up
->
port
.
iobase
+
1
);
outb
(
value
,
up
->
port
.
iobase
+
1
);
break
;
break
;
case
SERIAL_
IO_MEM
:
case
UP
IO_MEM
:
writeb
(
value
,
up
->
port
.
membase
+
offset
);
writeb
(
value
,
up
->
port
.
membase
+
offset
);
break
;
break
;
...
@@ -1613,7 +1613,7 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res
...
@@ -1613,7 +1613,7 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res
int
ret
=
0
;
int
ret
=
0
;
switch
(
up
->
port
.
iotype
)
{
switch
(
up
->
port
.
iotype
)
{
case
SERIAL_
IO_MEM
:
case
UP
IO_MEM
:
if
(
up
->
port
.
mapbase
)
{
if
(
up
->
port
.
mapbase
)
{
*
res
=
request_mem_region
(
up
->
port
.
mapbase
,
size
,
"serial"
);
*
res
=
request_mem_region
(
up
->
port
.
mapbase
,
size
,
"serial"
);
if
(
!*
res
)
if
(
!*
res
)
...
@@ -1621,8 +1621,8 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res
...
@@ -1621,8 +1621,8 @@ serial8250_request_std_resource(struct uart_8250_port *up, struct resource **res
}
}
break
;
break
;
case
SERIAL_
IO_HUB6
:
case
UP
IO_HUB6
:
case
SERIAL_
IO_PORT
:
case
UP
IO_PORT
:
*
res
=
request_region
(
up
->
port
.
iobase
,
size
,
"serial"
);
*
res
=
request_region
(
up
->
port
.
iobase
,
size
,
"serial"
);
if
(
!*
res
)
if
(
!*
res
)
ret
=
-
EBUSY
;
ret
=
-
EBUSY
;
...
@@ -1639,7 +1639,7 @@ serial8250_request_rsa_resource(struct uart_8250_port *up, struct resource **res
...
@@ -1639,7 +1639,7 @@ serial8250_request_rsa_resource(struct uart_8250_port *up, struct resource **res
int
ret
=
0
;
int
ret
=
0
;
switch
(
up
->
port
.
iotype
)
{
switch
(
up
->
port
.
iotype
)
{
case
SERIAL_
IO_MEM
:
case
UP
IO_MEM
:
if
(
up
->
port
.
mapbase
)
{
if
(
up
->
port
.
mapbase
)
{
start
=
up
->
port
.
mapbase
;
start
=
up
->
port
.
mapbase
;
start
+=
UART_RSA_BASE
<<
up
->
port
.
regshift
;
start
+=
UART_RSA_BASE
<<
up
->
port
.
regshift
;
...
@@ -1649,8 +1649,8 @@ serial8250_request_rsa_resource(struct uart_8250_port *up, struct resource **res
...
@@ -1649,8 +1649,8 @@ serial8250_request_rsa_resource(struct uart_8250_port *up, struct resource **res
}
}
break
;
break
;
case
SERIAL_
IO_HUB6
:
case
UP
IO_HUB6
:
case
SERIAL_
IO_PORT
:
case
UP
IO_PORT
:
start
=
up
->
port
.
iobase
;
start
=
up
->
port
.
iobase
;
start
+=
UART_RSA_BASE
<<
up
->
port
.
regshift
;
start
+=
UART_RSA_BASE
<<
up
->
port
.
regshift
;
*
res
=
request_region
(
start
,
size
,
"serial-rsa"
);
*
res
=
request_region
(
start
,
size
,
"serial-rsa"
);
...
@@ -1675,7 +1675,7 @@ static void serial8250_release_port(struct uart_port *port)
...
@@ -1675,7 +1675,7 @@ static void serial8250_release_port(struct uart_port *port)
size
<<=
up
->
port
.
regshift
;
size
<<=
up
->
port
.
regshift
;
switch
(
up
->
port
.
iotype
)
{
switch
(
up
->
port
.
iotype
)
{
case
SERIAL_
IO_MEM
:
case
UP
IO_MEM
:
if
(
up
->
port
.
mapbase
)
{
if
(
up
->
port
.
mapbase
)
{
/*
/*
* Unmap the area.
* Unmap the area.
...
@@ -1691,8 +1691,8 @@ static void serial8250_release_port(struct uart_port *port)
...
@@ -1691,8 +1691,8 @@ static void serial8250_release_port(struct uart_port *port)
}
}
break
;
break
;
case
SERIAL_
IO_HUB6
:
case
UP
IO_HUB6
:
case
SERIAL_
IO_PORT
:
case
UP
IO_PORT
:
start
=
up
->
port
.
iobase
;
start
=
up
->
port
.
iobase
;
if
(
size
)
if
(
size
)
...
...
This diff is collapsed.
Click to expand it.
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