Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/win parallel port #138

Merged
merged 21 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6fafd53
wind32 parallel port
maartenuni Nov 13, 2024
b61ff02
win32-elabortat parallelport
maartenuni Nov 13, 2024
32ad882
Update build system, e.g. copy dll to builddir
maartenuni Nov 18, 2024
97ffff8
Add dll's for parallelport windows
maartenuni Nov 18, 2024
7ec088f
configure. add macro's for architecture
maartenuni Nov 18, 2024
e1bee59
install inpout.dll in psy folder as then they are on the path
maartenuni Nov 18, 2024
4459896
Various updates to the windows parallel port
maartenuni Nov 18, 2024
77a5ea8
Add toy to play with wmi so search for spp registers
maartenuni Nov 21, 2024
38b3ccf
ParallelPort: add virtual support for enumeration
maartenuni Nov 22, 2024
2c01c4d
Update psy_parallel_port_enumerate signature
maartenuni Nov 22, 2024
f50e80b
ParallelPort: enum ports on Linux
maartenuni Nov 25, 2024
91f8a93
Fix lineendings toys/sleeptime
maartenuni Nov 25, 2024
080ed7f
Replace line endings
maartenuni Nov 25, 2024
4e2aab1
Merge branch 'feature/win-parallel-port' of github.com:UiL-OTS-labs/p…
maartenuni Nov 25, 2024
bc111a1
Enumerate and open parallel ports on windows
maartenuni Nov 29, 2024
f5c52d3
Fix crash on freeing PsyTimePoint's
maartenuni Nov 29, 2024
7139cee
InpoutPort make sure every line is low after open
maartenuni Dec 2, 2024
40f63ff
WIN32 Call TimeBeginPeriod(0) on psylib init
maartenuni Dec 2, 2024
b1f05ea
Fix compilation error with clang
maartenuni Dec 2, 2024
239c0b4
use g_usleep to sleep for one ms
maartenuni Dec 2, 2024
9c84cfb
Fix deadlock in psy_init
maartenuni Dec 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ psy_deps = [
epoxy_dep,
gstreamer_dep,
gstreamer_app_dep,
cairo_dep,
pango_dep,
pangocairo_dep
]

# add optional dependencies
Expand Down Expand Up @@ -144,6 +147,12 @@ endif
# psy_deps += kernel32_dep
# endif

# to query WMI for hardware stuff on windows
wbemuuid_dep = cc.find_library('wbemuuid', static:true, required: false)
if wbemuuid_dep.found()
psy_deps += wbemuuid_dep
endif

message('the depencies are: ')
foreach dep : psy_deps
message(' - ', dep.name())
Expand All @@ -156,6 +165,7 @@ psy_deps += winmm_dep
psy_deps += kernel32_dep

gnome = import('gnome')
fs = import ('fs')

subdir('psy')
subdir('share')
Expand All @@ -181,5 +191,3 @@ endif
if get_option('documentation')
subdir('doc')
endif


5 changes: 5 additions & 0 deletions programs/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,8 @@ psy_enum_fonts = executable (
dependencies : [psy_dep]
)

psy_enum_parallel = executable (
'psy-enum-parallel',
files('psy-enum-parallel.c'),
dependencies : [psy_dep]
)
22 changes: 22 additions & 0 deletions programs/psy-enum-parallel.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

#include "hw/psy-parallel-port.h"
#include <psylib.h>

int
main(void)
{
gint n = 0;
PsyParallelPortInfo **ports = NULL;

PsyParallelPort *port = psy_parallel_port_new();

psy_parallel_port_enumerate(port, &ports, &n);

for (int i = 0; i < n; i++) {
g_print("Port %d: %s\n",
psy_parallel_port_info_port_number(ports[i]),
psy_parallel_port_info_name(ports[i]));
}

psy_parallel_port_free(port);
}
Binary file added psy/hw/inpout32.dll
Binary file not shown.
Binary file added psy/hw/inpoutx64.dll
Binary file not shown.
6 changes: 6 additions & 0 deletions psy/hw/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@ if cdata.has('HAVE_LINUX_PARPORT_H') and cdata.has('HAVE_LINUX_PPDEV_H')
libpsyfiles += files('psy-parport.c')
libpsy_headers += files('psy-parport.h')
endif


if host_machine.system() in ['windows', 'cygwin']
libpsyfiles += files('psy-inpout-port.c')
libpsy_headers += files('psy-inpout-port.h')
endif
Loading
Loading