Skip to content

Commit

Permalink
pcireg: Rewrite PCI ID system to compress database with LHA
Browse files Browse the repository at this point in the history
Database building has been moved away from the build process at least for now, due to the fact lha isn't packaged anywhere.
  • Loading branch information
richardg867 committed Oct 23, 2024
1 parent 2345666 commit db68540
Show file tree
Hide file tree
Showing 12 changed files with 793 additions and 259 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ jobs:
make -f Makefile.gcc clean all CC=i686-w64-mingw32-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static LDAPPEND=-lcfgmgr32 CP437_CONV=y DEST=pciregw
make -f Makefile.gcc clean all CC=x86_64-w64-mingw32-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static LDAPPEND=-lcfgmgr32 CP437_CONV=y DEST=pciregw64
make -f Makefile.gcc clean all CC=i686-linux-gnu-gcc CFLAGS=-I/usr/local/include LDFLAGS=-static
python3 pciids.py
- name: Build `usblgoff`
run: |
cd ${{ github.workspace }}/usblgoff
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ pci?????.bin
*.efi
pcireg/pcireg
ac97/ac97
PCIIDS.BIN
PCIIDS_*.BIN
2 changes: 1 addition & 1 deletion pcireg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#

SYSTEM = PMODEW
OBJS = pcireg.obj clib_pci.obj clib_std.obj clib_sys.obj clib_term.obj
OBJS = pcireg.obj lh5_extract.obj clib_pci.obj clib_std.obj clib_sys.obj clib_term.obj
DEST = PCIREG.EXE

!include ../clib/watcom.mk
2 changes: 1 addition & 1 deletion pcireg/Makefile.gcc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Copyright 2023 RichardG.
#

export OBJS = pcireg.o clib_pci.o clib_std.o clib_sys.o clib_term.o
export OBJS = pcireg.o lh5_extract.o clib_pci.o clib_std.o clib_sys.o clib_term.o
export DEST = pcireg
override LDFLAGS += -lpci $(LDAPPEND)

Expand Down
2 changes: 1 addition & 1 deletion pcireg/Makefile.uefi
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Copyright 2021 RichardG.
#

export OBJS = pcireg.o clib_pci.o clib_std.o clib_sys.o clib_term.o
export OBJS = pcireg.o lh5_extract.o clib_pci.o clib_std.o clib_sys.o clib_term.o
export DEST = PCIREG.EFI

include ../clib/uefi.mk
Binary file added pcireg/PCIIDS.LHA
Binary file not shown.
2 changes: 1 addition & 1 deletion pcireg/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,5 @@ Building

### PCI ID database

* Run `python3 pciids.py` to update the `PCIIDS.BIN` file.
* Run `python3 pciids.py` to update the PCI ID files, then `lha a1o5 PCIIDS.LHA PCIIDS_*.BIN` to compress them in the expected format.
* The latest version of `pci.ids` is automatically downloaded and used to update the database.
Loading

0 comments on commit db68540

Please sign in to comment.