Skip to content

More misc cleanup #688

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 6 commits into from
Jan 15, 2020
Merged

More misc cleanup #688

merged 6 commits into from
Jan 15, 2020

Conversation

flit
Copy link
Collaborator

@flit flit commented Jan 6, 2020 •
edited
Loading

  • Cleanup of main.h headers.
  • Merged macro.h into util.h
  • Moved ARRAY_SIZE() macro to util.h, replacing ELEMENTS_IN_ARRAY().
  • Using a single definition of MAX() from util.h.
  • Changed the disc_size constant in vfs_user.c to a macro.
  • Replaced the weak, null family descriptor structs with weak references to those structs and a different terminator value for g_families (so entries in that array can be null without terminating the list).
  • Changed most includes of C Standard Library headers to be system includes (angle brackets instead of quotes). Didn't touch vendor-supplied SDK sources for the most part.
  • Trailing whitespace cleanup.

@flit
Copy link
Collaborator Author

flit commented Jan 6, 2020

/morph test

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 7, 2020

Build failures in the CI logs, please review

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 7, 2020

Most of the commits look fine, need to review them in more detail. One is adding new functionality: 2b61b1f , shouldn't this be in separate PR?

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 8, 2020

/morph test

@flit
Copy link
Collaborator Author

flit commented Jan 8, 2020 •
edited
Loading

Good point about the new hooks in 2b61b1f, I'll pull that into a separate PR. There are a few other changes that I'll pull out, as well.

@flit
Copy link
Collaborator Author

flit commented Jan 9, 2020

Split out several changes to new branches. They'll be merged after this one.

@flit
Copy link
Collaborator Author

flit commented Jan 9, 2020

/morph test

@40Grit
Copy link

40Grit commented Jan 9, 2020

Nothing more refreshing then a big batch of refactor.

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 10, 2020

/morph test

@flit
Copy link
Collaborator Author

flit commented Jan 10, 2020

Mac and Win failed with:

[1578670942.622000] SubTest: Build test configuration
[1578670942.622000] No board to test firmware sam3u2c_mkit_dk_dongle_nrf5x_if
[1578670942.622000] No board to test firmware sam3u2c_mkit_dk_dongle_nrf5x_if
[1578670942.622000] No board to test firmware sam3u2c_mkit_dk_dongle_nrf5x_if
[1578670942.622000] No target to test firmware sam3u2c_mkit_dk_dongle_nrf5x_if
[1578670942.622000] No board to test firmware sam3u2c_mkit_dk_dongle_nrf5x_if
[1578670942.622000] No board to test firmware kl26z_microbit_if
[1578670942.622000] Test configurations to be run:
[1578670942.622000]     0: APP=k20dx_frdmk82f_if BL=k20dx_bl Board=FRDM-K82F Target=FRDM-K82F
[1578670942.622000]     1: APP=k20dx_frdmkl82z_if BL=k20dx_bl Board=FRDM-KL82Z Target=FRDM-KL82Z
[1578670942.622000]     2: APP=k20dx_frdmk22f_if BL=k20dx_bl Board=FRDM-K22F Target=FRDM-K22F
[1578670942.622000]     3: APP=k20dx_frdmk64f_if BL=k20dx_bl Board=FRDM-K64F Target=FRDM-K64F
[1578670942.622000]     4: APP=kl26z_microbit_if BL=kl26z_bl Board=Microbit Target=Microbit
[1578670942.622000] 
[1578670942.622000] Fimrware that will not be tested:
[1578670942.622000]     sam3u2c_mkit_dk_dongle_nrf5x_if
[1578670942.622000] 
[1578670942.622000] Exiting because not all firmware could be tested

Linux failed with a USB timeout while testing CDC.

@flit flit mentioned this pull request Jan 10, 2020
Merged
@flit
Copy link
Collaborator Author

flit commented Jan 11, 2020

/morph test

1 similar comment
@0xc0170
Copy link
Contributor

0xc0170 commented Jan 13, 2020

/morph test

@flit
Copy link
Collaborator Author

flit commented Jan 13, 2020

The Linux tests are consistently failing (ignoring the apparent hw problems with Mac and Win), so there must be some problem introduced by this PR. I'm going to continue to break changes out from this one so the issue can hopefully be isolated.

@flit
Copy link
Collaborator Author

flit commented Jan 15, 2020

Rebased and dropped the changes that are now in #692 (and which seem to be causing trouble).

@flit
Copy link
Collaborator Author

flit commented Jan 15, 2020

/morph test

1 similar comment
@0xc0170
Copy link
Contributor

0xc0170 commented Jan 15, 2020

/morph test

@flit flit merged commit e51b506 into ARMmbed:master Jan 15, 2020
@flit flit deleted the cleanup/misc2 branch January 15, 2020 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xc0170 0xc0170 0xc0170 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@flit @0xc0170 @40Grit