XLibre/xf86-video-sis
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-sis.git synced 2026-03-23 17:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Strip trailing whitespace from source files

Browse Source 
Performed with: `git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'`

`git diff -w` & `git diff -b` show no diffs from this change

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/42>
This commit is contained in:
Alan Coopersmith
2025-08-20 17:32:07 -07:00
committed by Enrico Weigelt, metux IT consult
parent ea3703e9fd
commit 37743f0433
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -71,8 +71,8 @@ core
*.tar.bz2 *.tar.bz2
*.tar.gz *.tar.gz
# #
# Add & Override patterns for xf86-video-sis # Add & Override patterns for xf86-video-sis
# #
# Edit the following section as needed # Edit the following section as needed
# For example, !report.pc overrides *.pc. See 'man gitignore' # For example, !report.pc overrides *.pc. See 'man gitignore'
# #

2
man/Makefile.am
View File

@@ -19,7 +19,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# #
drivermandir = $(DRIVER_MAN_DIR) drivermandir = $(DRIVER_MAN_DIR)

2
src/Makefile.am
View File

@@ -76,5 +76,5 @@ sis_drv_la_SOURCES = \
if DRI if DRI
sis_drv_la_SOURCES += \ sis_drv_la_SOURCES += \
sis_dri.c \ sis_dri.c \
sis_dri.h sis_dri.h
endif endif

10
src/sis300_accel.h
View File

@@ -295,13 +295,13 @@
CmdQueLen--; CmdQueLen--;
/* Set Pattern register */ /* Set Pattern register */
#define SiSSetPattern(num, value) \ #define SiSSetPattern(num, value) \
if (CmdQueLen <= 0) SiSIdle; \ if (CmdQueLen <= 0) SiSIdle; \
SIS_MMIO_OUT32(pSiS->IOBase, (PATTERN_REG + (num * 4)), value); \ SIS_MMIO_OUT32(pSiS->IOBase, (PATTERN_REG + (num * 4)), value); \
CmdQueLen--; CmdQueLen--;
/* 3D stuff (used for RENDER) */ /* 3D stuff (used for RENDER) */
/* /*
@@ -1036,7 +1036,7 @@
#define RGB_REPLACE__A_STAGE1 0xa3230000 #define RGB_REPLACE__A_STAGE1 0xa3230000
#define RGBA_REPLACE__RGB_STAGE1 0xe1485000 #define RGBA_REPLACE__RGB_STAGE1 0xe1485000
#define RGBA_REPLACE__A_STAGE1 0xe3230000 #define RGBA_REPLACE__A_STAGE1 0xe3230000
#define A_MODULATE_RGB_STAGE1 0xa1485000 #define A_MODULATE_RGB_STAGE1 0xa1485000
#define A_MODULATE_A_STAGE1 0xa3e30000 #define A_MODULATE_A_STAGE1 0xa3e30000
#define L_MODULATE__RGB_STAGE1 0xa1785000 #define L_MODULATE__RGB_STAGE1 0xa1785000
@@ -1066,7 +1066,7 @@
#define RGB_BLEND__RGB_STAGE1 0x45394001 #define RGB_BLEND__RGB_STAGE1 0x45394001
#define RGB_BLEND__A_STAGE1 0xa3230000 #define RGB_BLEND__A_STAGE1 0xa3230000
#define RGBA_BLEND__RGB_STAGE1 0x45394001 #define RGBA_BLEND__RGB_STAGE1 0x45394001
#define RGBA_BLEND__A_STAGE1 0xa3e30000 #define RGBA_BLEND__A_STAGE1 0xa3e30000
#define INIT_6327_CapsEnable 0x00000080 #define INIT_6327_CapsEnable 0x00000080
@@ -1180,5 +1180,5 @@ do{ \
CmdQueLen = (SIS_MMIO_IN16(pSiS->IOBase, 0x8240) & pSiS->CmdQueLenMask) - pSiS->CmdQueLenFix; \ CmdQueLen = (SIS_MMIO_IN16(pSiS->IOBase, 0x8240) & pSiS->CmdQueLenMask) - pSiS->CmdQueLenFix; \
} \ } \
CmdQueLen -= (int)(wLen); \ CmdQueLen -= (int)(wLen); \
} while(0) } while(0)

2
src/sis_driver.c
View File

@@ -1501,7 +1501,7 @@ SiSGenerateModeListFromMetaModes(ScrnInfoPtr pScrn, char* str,
} }
} while(*(str++) != 0); } while(*(str++) != 0);
return result; return result;
} }

6
src/sis_setup.c
View File

@@ -188,7 +188,7 @@ sis_pci_read_host_bridge_u8(int offset)
{ {
return sis_pci_read_device_u8(0, offset); return sis_pci_read_device_u8(0, offset);
} }
static int sisESSPresent(ScrnInfoPtr pScrn) static int sisESSPresent(ScrnInfoPtr pScrn)
{ {
int flags = 0; int flags = 0;
@@ -219,13 +219,13 @@ static int sisESSPresent(ScrnInfoPtr pScrn)
id_iterator = pci_id_match_iterator_create(&id_match); id_iterator = pci_id_match_iterator_create(&id_match);
ess137x = pci_device_next(id_iterator); ess137x = pci_device_next(id_iterator);
while (ess137x) { while (ess137x) {
if ((ess137x->device_id == 0x5000) || if ((ess137x->device_id == 0x5000) ||
((ess137x->device_id & 0xfff0) == 0x1370)) { ((ess137x->device_id & 0xfff0) == 0x1370)) {
flags |= ESS137xPRESENT; flags |= ESS137xPRESENT;
} }
ess137x = pci_device_next(id_iterator); ess137x = pci_device_next(id_iterator);
} }
return flags; return flags;
#endif #endif

2
src/sispcirename.h
View File

@@ -33,7 +33,7 @@
enum region_type { enum region_type {
REGION_MEM, REGION_MEM,
REGION_IO REGION_IO
}; };
#include "xf86Module.h" #include "xf86Module.h"