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

Release Candidate v6.4.0 #1013

Merged
merged 45 commits into from
Jul 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
1b65235
updating docker and conda to source reusable YAML CI scripts
ruck314 Jun 27, 2024
112dfb6
adding C++ linter
ruck314 Jun 28, 2024
cdb5fd7
adding cpplinter message filter
ruck314 Jun 28, 2024
5b8e4bc
resolving c++ linter
ruck314 Jun 28, 2024
1d326cf
updates to CPPLINT.cfg
ruck314 Jun 28, 2024
66fb36e
resolving c++ linter
ruck314 Jun 28, 2024
9e385b8
resolving c++ linter
ruck314 Jun 28, 2024
8d98bcf
increase linelength to 160 (required for block.cpp)
ruck314 Jun 28, 2024
4d6b91b
resolving c++ linter
ruck314 Jun 28, 2024
d45e886
resolving c++ linter
ruck314 Jun 28, 2024
754c797
resolving c++ linter
ruck314 Jun 28, 2024
cf1635e
resolving c++ linter
ruck314 Jun 28, 2024
1624549
resolving c++ linter
ruck314 Jun 28, 2024
dc079e4
resolving c++ linter
ruck314 Jun 28, 2024
d09afc6
resolving c++ linter
ruck314 Jun 28, 2024
5f0c5dd
Disable the build/header_guard check
ruck314 Jun 28, 2024
459ae15
resolving c++ linter
ruck314 Jun 28, 2024
7fda4ac
resolving c++ linter
ruck314 Jun 28, 2024
7d6cf39
resolving c++ linter
ruck314 Jun 28, 2024
104d935
resolving c++ linter
ruck314 Jun 28, 2024
b38fc55
resolving c++ linter
ruck314 Jun 28, 2024
7106799
resolving c++ linter
ruck314 Jun 28, 2024
49a7451
resolving c++ linter
ruck314 Jun 29, 2024
251dab6
resolving c++ linter
ruck314 Jun 29, 2024
d881466
resolving c++ linter
ruck314 Jun 29, 2024
99eb02a
resolving c++ linter
ruck314 Jun 29, 2024
1a96141
increase linelength to 250 for Variables.cpp
ruck314 Jun 29, 2024
c0ab7df
disable [runtime/arrays] filter
ruck314 Jun 29, 2024
41a72ba
resolving c++ linter
ruck314 Jun 29, 2024
cfe949b
adding [runtime/references] filter
ruck314 Jun 29, 2024
2eb6827
resolving c++ linter
ruck314 Jun 29, 2024
ce84209
resolving c++ linter
ruck314 Jun 29, 2024
9d43d45
resolving c++ linter
ruck314 Jun 29, 2024
34236a7
resolving c++ linter
ruck314 Jun 29, 2024
a8322ae
resolving c++ linter
ruck314 Jun 29, 2024
d0cbc4b
polishing the code headers to be the same formating across all cpp/h/…
ruck314 Jul 8, 2024
bbee743
reran clang-format to sync up with cpplint
ruck314 Jul 10, 2024
c2ddf8e
Merge pull request #1012 from slaclab/ESROGUE-554
ruck314 Jul 10, 2024
221deb8
Merge pull request #1010 from slaclab/reusable-CI-yaml
ruck314 Jul 10, 2024
c01e850
Delete =
ruck314 Jul 10, 2024
316104b
Fix minimum value for Int
SEBv15 Jul 11, 2024
d9bf4d9
Merge pull request #1014 from SEBv15/main
ruck314 Jul 20, 2024
f64ca19
Fix high range byte for reads
slacrherbst Jul 23, 2024
f13d849
linter fix
ruck314 Jul 23, 2024
ab08b96
Merge pull request #1016 from slaclab/high_byte_fix
ruck314 Jul 23, 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
Prev Previous commit
Next Next commit
resolving c++ linter
Using C-style cast.  Use reinterpret_cast<void**>(...) instead  [readability/casting]
ruck314 committed Jun 28, 2024
commit d09afc6f33b68dae738cbeefbdfcc386c7946bbf
2 changes: 1 addition & 1 deletion include/rogue/hardware/drivers/DmaDriver.h
Original file line number Diff line number Diff line change
@@ -676,7 +676,7 @@ static inline void** dmaMapDma(int32_t fd, uint32_t* count, uint32_t* size) {
if (count != NULL) *count = bCount;
if (size != NULL) *size = bSize;

if ((ret = (void**)malloc(sizeof(void*) * bCount)) == 0) return (NULL);
if ((ret = reinterpret_cast<void**>(malloc(sizeof(void*) * bCount))) == 0) return (NULL);

// Attempt to map
gCount = 0;