Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

triazo / kernel

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 3
  • Merge Requests 0
  • Wiki
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge request !8 opened Oct 04, 2015 by malcolm@malcolm 

Gdtldt

Still some unexplained weird things, but works.

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b GDTLDT origin/GDTLDT

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff GDTLDT

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 2
  • Commits 19
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • malcolm @malcolm

    Added 1 commit:

    • 83b7c108 - Style fixes
    Oct 04, 2015

    Added 1 commit:

    • 83b7c108 - Style fixes
    Added 1 commit: * 83b7c108 - Style fixes
    Toggle commit list
  • Triazo2 512
    triazo
    @triazo started a discussion on an old version of the diff Oct 04, 2015
    src/gdt.c 0 → 100644
    1 #include "gdt.h"
    2 #include "string.h"
    3 #include "serial.h"
    4 #include "term.h"
    • triazo @triazo commented Oct 04, 2015
      Master

      term.h should no longer be needed

      term.h should no longer be needed
    Please register or sign in to reply
  • Triazo2 512
    triazo
    @triazo started a discussion on the diff Oct 04, 2015
    src/gdt.c 0 → 100644
    1 #include "gdt.h"
    2 #include "string.h"
    3 #include "serial.h"
    4 #include "term.h"
    5
    6 uint16_t gdt_limit;
    7 uint32_t gdt_base;
    8
    9 gdt_desc _gdt [MAX_GDT_DESC];
    10
    11 #define set_cs( cs ) asm volatile ( "ljmp %0, $1337f \n\t 1337: \n\t" :: "i"(cs) )
    12 void gdt_install(){
    13 struct{
    14 uint16_t limit;
    15 uint32_t base;
    • triazo @triazo commented Oct 04, 2015
      Master

      check spacing

      check spacing
    Please register or sign in to reply
  • malcolm @malcolm

    Added 1 commit:

    • 8ffdb91a - Maybe fixes some stuff dark magic why:
    Oct 04, 2015

    Added 1 commit:

    • 8ffdb91a - Maybe fixes some stuff dark magic why:
    Added 1 commit: * 8ffdb91a - Maybe fixes some stuff dark magic why:
    Toggle commit list
  • triazo @triazo

    Status changed to merged

    Oct 04, 2015

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • triazo @triazo

    mentioned in commit 3b3b9e3c

    Oct 04, 2015

    mentioned in commit 3b3b9e3c

    mentioned in commit 3b3b9e3cde3db27ce38bdf10a8ee133da2f9ba82
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: triazo/kernel!8