diff options
| author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2003-11-14 03:11:29 +0000 |
|---|---|---|
| committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2003-11-14 03:11:29 +0000 |
| commit | a0282b33763f109688c79617558e5b0c2b307232 (patch) | |
| tree | 0f75de41886affd1c3fbff8db2a53b6f5a5a8faf | |
| parent | 2cf9270dcba8467ca47b7e7f8c391cbdac531082 (diff) | |
| download | busybox-w32-a0282b33763f109688c79617558e5b0c2b307232.tar.gz busybox-w32-a0282b33763f109688c79617558e5b0c2b307232.tar.bz2 busybox-w32-a0282b33763f109688c79617558e5b0c2b307232.zip | |
Oskar Liljeblad writes:
Here's a fix for the hard-coded device name in fbset.
git-svn-id: svn://busybox.net/trunk/busybox@7906 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | util-linux/fbset.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index 21ea31690..f1f4f5c0a 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -376,6 +376,7 @@ extern int bb_default_error_retval; | |||
| 376 | #endif | 376 | #endif |
| 377 | # define VC_FORMAT "/dev/vc/%d" | 377 | # define VC_FORMAT "/dev/vc/%d" |
| 378 | # define LOOP_FORMAT "/dev/loop/%d" | 378 | # define LOOP_FORMAT "/dev/loop/%d" |
| 379 | # define FB_0 "/dev/fb/0" | ||
| 379 | #else | 380 | #else |
| 380 | # define CURRENT_VC "/dev/tty0" | 381 | # define CURRENT_VC "/dev/tty0" |
| 381 | # define VC_1 "/dev/tty1" | 382 | # define VC_1 "/dev/tty1" |
| @@ -394,6 +395,7 @@ extern int bb_default_error_retval; | |||
| 394 | #endif | 395 | #endif |
| 395 | # define VC_FORMAT "/dev/tty%d" | 396 | # define VC_FORMAT "/dev/tty%d" |
| 396 | # define LOOP_FORMAT "/dev/loop%d" | 397 | # define LOOP_FORMAT "/dev/loop%d" |
| 398 | # define FB_0 "/dev/fb0" | ||
| 397 | #endif | 399 | #endif |
| 398 | 400 | ||
| 399 | //#warning put these in .o files | 401 | //#warning put these in .o files |
diff --git a/util-linux/fbset.c b/util-linux/fbset.c index f66ebe546..b5f57b1e4 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <sys/ioctl.h> | 35 | #include <sys/ioctl.h> |
| 36 | #include "busybox.h" | 36 | #include "busybox.h" |
| 37 | 37 | ||
| 38 | #define DEFAULTFBDEV "/dev/fb0" | 38 | #define DEFAULTFBDEV FB_0 |
| 39 | #define DEFAULTFBMODE "/etc/fb.modes" | 39 | #define DEFAULTFBMODE "/etc/fb.modes" |
| 40 | 40 | ||
| 41 | static const int OPT_CHANGE = (1 << 0); | 41 | static const int OPT_CHANGE = (1 << 0); |
