Skip to content

Commit

Permalink
Merge pull request #3070 from authmillenon/ng_slip/fix/rename-params
Browse files Browse the repository at this point in the history
ng_slip: rename xbee_params_t to ng_slip_params_t
  • Loading branch information
OlegHahm committed May 26, 2015
2 parents cfd9a59 + c29a4b4 commit 1bd5a82
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion sys/include/net/ng_slip.h
Expand Up @@ -65,7 +65,7 @@ typedef struct {
typedef struct xbee_params {
uart_t uart; /**< UART interfaced the device is connected to */
uint32_t baudrate; /**< baudrate to use */
} xbee_params_t;
} ng_slip_params_t;

/**
* @brief Initializes a new @ref net_ng_slip control thread for UART device
Expand Down
4 changes: 3 additions & 1 deletion tests/slip/slip_params.h
Expand Up @@ -19,11 +19,13 @@
#ifndef SLIP_PARAMS_H
#define SLIP_PARAMS_H

#include "net/ng_slip.h"

#ifdef __cplusplus
extern "C" {
#endif

static xbee_params_t xbee_params[] = {
static ng_slip_params_t xbee_params[] = {
{
.uart = SLIP_UART,
.baudrate = SLIP_BAUDRATE,
Expand Down

0 comments on commit 1bd5a82

Please sign in to comment.