Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: qbarnes/gw2dmk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.0.1.alpha.3
Choose a base ref
...
head repository: qbarnes/gw2dmk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Sep 14, 2024

  1. Copy the full SHA
    f2b93fc View commit details
  2. Add postcomp support.

    qbarnes committed Sep 14, 2024
    Copy the full SHA
    81e424a View commit details
  3. Copy the full SHA
    5b4f8a6 View commit details
  4. Copy the full SHA
    082e33a View commit details

Commits on Sep 15, 2024

  1. Reformat option definitions.

    qbarnes committed Sep 15, 2024
    Copy the full SHA
    d87602c View commit details
  2. Catch when '--usehisto' is given with -k but disk is unformatted

    and make --nousehisto default.
    qbarnes committed Sep 15, 2024
    Copy the full SHA
    75396f4 View commit details
  3. Copy the full SHA
    42e125c View commit details

Commits on Sep 17, 2024

  1. Some code cleanup.

    qbarnes committed Sep 17, 2024
    Copy the full SHA
    6dbf39e View commit details
  2. Add -z option for gw2dmk.

    qbarnes committed Sep 17, 2024
    Copy the full SHA
    f0da92e View commit details

Commits on Sep 24, 2024

  1. Copy the full SHA
    953a9e0 View commit details

Commits on Oct 27, 2024

  1. Copy the full SHA
    32f05d8 View commit details
  2. Make error message clearer.

    qbarnes committed Oct 27, 2024
    Copy the full SHA
    f31e03e View commit details

Commits on Oct 31, 2024

  1. Copy the full SHA
    938f549 View commit details
  2. Copy the full SHA
    3a5e57d View commit details

Commits on Nov 2, 2024

  1. Fix check compat sides.

    qbarnes committed Nov 2, 2024
    Copy the full SHA
    7c426de View commit details

Commits on Nov 5, 2024

  1. Copy the full SHA
    501d3e4 View commit details

Commits on Nov 8, 2024

  1. Copy the full SHA
    6bbf41c View commit details
  2. Copy the full SHA
    433d7ee View commit details

Commits on Nov 9, 2024

  1. Copy the full SHA
    d5dfe55 View commit details

Commits on Nov 10, 2024

  1. Fix bad thresholds when using --usehisto on some disks.

    Ira found a disk (evan1007) that needed the min_threshold multiplier
    upped from 0.06 to 0.33.  I went ahead and gave it a margin bumping
    it to 0.50.  Time will tell if it's too much the other way.
    qbarnes committed Nov 10, 2024
    Copy the full SHA
    9d08c12 View commit details
  2. Copy the full SHA
    dfb2abe View commit details

Commits on Nov 12, 2024

  1. Copy the full SHA
    58996bd View commit details

Commits on Nov 14, 2024

  1. Copy the full SHA
    27d000e View commit details
  2. Copy the full SHA
    da2cc98 View commit details

Commits on Nov 23, 2024

  1. Correct handling of 2 digit COM device names for older Microsoft OSes

    by using the "\\.\" filename prefix.
    qbarnes committed Nov 23, 2024
    Copy the full SHA
    4293cbb View commit details

Commits on Nov 24, 2024

  1. Copy the full SHA
    797af7f View commit details

Commits on Nov 25, 2024

  1. Copy the full SHA
    ced056a View commit details
  2. Copy the full SHA
    88f9b73 View commit details
  3. Copy the full SHA
    714c26f View commit details
  4. Copy the full SHA
    b1da305 View commit details

Commits on Nov 26, 2024

  1. Copy the full SHA
    316072f View commit details
  2. Copy the full SHA
    a397dfd View commit details

Commits on Dec 5, 2024

  1. Copy the full SHA
    9117191 View commit details

Commits on Jan 28, 2025

  1. Copy the full SHA
    6bd23b8 View commit details

Commits on Jan 30, 2025

  1. Copy the full SHA
    c732d15 View commit details
  2. Copy the full SHA
    065a35f View commit details
  3. Use the native tool environment of the crossbuild-aarch64 container

    for native building.
    qbarnes committed Jan 30, 2025
    Copy the full SHA
    77812e0 View commit details

Commits on Feb 19, 2025

  1. Copy the full SHA
    1963038 View commit details
Showing with 2,161 additions and 647 deletions.
  1. +5 −7 .github/workflows/gw2dmk-build.yml
  2. +2 −2 .github/workflows/gw2dmk-release.yml
  3. +10 −9 BUILDING.md
  4. +28 −5 Makefile.build
  5. +1 −1 dmk.h
  6. +455 −0 dmk2gw.1
  7. +149 −182 dmk2gw.c
  8. +4 −3 dmkx.c
  9. +947 −0 gw2dmk.1
  10. +212 −314 gw2dmk.c
  11. +2 −0 gw2dmkcmdset.h
  12. +14 −15 gwdecode.c
  13. +1 −2 gwdecode.h
  14. +3 −2 gwdetect.c
  15. +140 −0 gwhist.1
  16. +150 −86 gwhist.c
  17. +1 −1 gwhisto.c
  18. +33 −16 gwmedia.c
  19. +3 −1 gwmedia.h
  20. +1 −1 product.mk
12 changes: 5 additions & 7 deletions .github/workflows/gw2dmk-build.yml
Original file line number Diff line number Diff line change
@@ -48,9 +48,7 @@ jobs:
package_name: ${{ steps.package_and_version.outputs.package_name }}
package_version: ${{ steps.package_and_version.outputs.package_version }}
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/checkout@v4

- id: package_and_version
run: |
@@ -73,6 +71,8 @@ jobs:
platform: [linux_x86_64, linux_armv7l, linux_aarch64, mswin32, mswin64]
include:
- platform: linux_x86_64
# Use crossbuild-aarch64 for native builds.
container: ${{ inputs.container_base }}/ubuntu-20.04-crossbuild-aarch64
target_platform_name: linux
target_platform: LINUX_X86_64
target_arch: .x86_64
@@ -97,9 +97,7 @@ jobs:
container:
image: ${{ matrix.container }}
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/checkout@v4

- name: Build target
id: build_target
@@ -109,7 +107,7 @@ jobs:
echo "build_artifacts_name=${package}-${version}-${target_platform_full_name}-build-artifacts" >> $GITHUB_OUTPUT
- name: Upload build artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ steps.build_target.outputs.build_artifacts_name }}
path: build.${{ env.target_platform_full_name }}/${{ env.package }}-${{ env.version }}-${{ env.target_platform_full_name }}.tar.gz
4 changes: 2 additions & 2 deletions .github/workflows/gw2dmk-release.yml
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Show package name and version
run: |
@@ -41,7 +41,7 @@ jobs:
run: mkdir github_artifacts

- name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: github_artifacts

19 changes: 10 additions & 9 deletions BUILDING.md
Original file line number Diff line number Diff line change
@@ -15,25 +15,26 @@ to install additional packages before you build.

### Installing packages

First, you'll need to install packages for C development.
First, you'll need to install packages for C development and generating
PDFs.

On Fedora and RHEL-like distros, run:

```
$ sudo dnf install -y @c-development
$ sudo dnf install -y @c-development groff-perl perl-IO-Compress
```

On Debian, Ubuntu, and related distros, run:

```
$ sudo apt-get update
$ sudo apt-get install -y build-essential
$ sudo apt-get install -y build-essential groff
```

Then when cloning this repo, make sure to use the `--recursive` flag like so:
To clone this repo, run:

```
$ git clone --recursive git@github.com:qbarnes/gw2dmk.git
$ git clone git@github.com:qbarnes/gw2dmk.git
```

### Building natively
@@ -79,10 +80,10 @@ $ sudo apt-get update
$ sudo apt-get install -y build-essential mingw-w64 gcc-aarch64-linux-gnu gcc-arm-linux-gnueabi
```

Then when cloning this repo, make sure to use the `--recursive` flag like so:
To clone this repo, run:

```
$ git clone --recursive git@github.com:qbarnes/gw2dmk.git
$ git clone git@github.com:qbarnes/gw2dmk.git
```

### Cross-building
@@ -141,10 +142,10 @@ $ sudo apt-get update
$ sudo apt-get install -y git make docker.io
```

Then when cloning this repo, make sure to use the `--recursive` flag like so:
To clone this repo, run:

```
$ git clone --recursive git@github.com:qbarnes/gw2dmk.git
$ git clone git@github.com:qbarnes/gw2dmk.git
```

### Using containers for building
33 changes: 28 additions & 5 deletions Makefile.build
Original file line number Diff line number Diff line change
@@ -8,6 +8,12 @@ ifdef E
LDLIBS += -static -lregex
endif

nroff ?= nroff
groff ?= groff

nroff_txt_flags ?= -c
groff_pdf_flags ?=

build_dir ?= build

ifndef top_dir
@@ -29,10 +35,17 @@ vpath % $(top_dir)
obj_targets = gw2dmk.o dmk2gw.o gw.o gwx.o msg.o m2.o gwhisto.o \
gwhist.o gwdetect.o crc.o

targets = gw2dmk$E dmk2gw$E gwhist$E m2$E
bins = gw2dmk dmk2gw gwhist
bin_targets = $(foreach b,$(bins), $b$E)

man_txt_targets = $(foreach b,$(bins),$b.1.txt)
man_pdf_targets = $(foreach b,$(bins),$b.1.pdf)
man_html_targets = $(foreach b,$(bins),$b.1.html)
man_targets = $(man_txt_targets) $(man_pdf_targets) $(man_html_targets)

targets = $(bin_targets) $(man_targets)

#tar_files = LICENSE README.md $(targets) $(tar_extras)
tar_files = LICENSE README.md gw2dmk$E dmk2gw$E gwhist$E $(tar_extras)
tar_files = LICENSE README.md $(targets) $(tar_extras)

clean_files = $(targets) $(obj_targets)

@@ -84,20 +97,30 @@ gw2dmk$E: msg.o gw.o gwx.o gwhisto.o gwdetect.o gwdecode.o gwmedia.o dmk.o \
dmk2gw$E: msg.o gw.o gwx.o gwdetect.o gwmedia.o dmk.o dmkx.o secsize.o dmk2gw.o
$(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o '$@'

gwhist$E: msg.o gw.o gwx.o gwhisto.o gwhist.o
gwhist$E: msg.o gw.o gwx.o gwhisto.o gwdetect.o gwhist.o
$(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o '$@'

m2$E: msg.o m2.o gw.o gwx.o
$(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o '$@'

%.txt: %
$(nroff) -man -Tascii $(nroff_txt_flags) $< | col -b | cat -s > $@

%.pdf: %
$(groff) -man -Tpdf $(groff_pdf_flags) $< > $@

%.html: %
$(groff) -man -Thtml $(groff_html_flags) $< > $@


$(TARBALLGZ): $(tar_files)
tar -czP \
--transform='s:^$(top_dir)/::' \
-f '$@' $^


clean clobber distclean:
$(call scrub_files_call,$($*_files))
$(call scrub_files_call,$($@_files))


.PHONY: FORCE all release
2 changes: 1 addition & 1 deletion dmk.h
Original file line number Diff line number Diff line change
@@ -43,7 +43,6 @@ extern "C" {
#define DMKI_TRACKLEN_8SD 0x14e0 /* DMK_TKHDR_SIZE + 5216 (nominal 5208) */
#define DMKI_TRACKLEN_8 0x2940 /* DMK_TKHDR_SIZE + 10432 (nominal 10416) */
#define DMKI_TRACKLEN_3HD 0x3180 /* DMK_TKHDR_SIZE + 12544 (nominal 12500) */
#define DMKI_TRACKLEN_MAX DMKI_TRACKLEN_3HD


/* Track lengths for reads from media. Allows for 2% slower than nominal
@@ -58,6 +57,7 @@ extern "C" {
#define DMKRD_TRACKLEN_8SD 0x1560 /* DMK_TKHDR_SIZE + 5344 (nominal 5208) */
#define DMKRD_TRACKLEN_8 0x2A40 /* DMK_TKHDR_SIZE + 10688 (nominal 10416) */
#define DMKRD_TRACKLEN_3HD 0x3260 /* DMK_TKHDR_SIZE + 12768 (nominal 12500) */
#define DMKRD_TRACKLEN_MIN DMKRD_TRACKLEN_5SD
#define DMKRD_TRACKLEN_MAX DMKRD_TRACKLEN_3HD


Loading